some feature test fixes for unistd.h

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index ea221b6..78fca47 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -4,28 +4,56 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#define libc __libc
-extern struct libc {
-       void (*lock)(volatile int *);
-       void (*cancelpt)(int);
+struct __libc {
+       void *main_thread;
+       int threaded;
+       int secure;
+       size_t *auxv;
        int (*atexit)(void (*)(void));
        void (*fini)(void);
        void (*ldso_fini)(void);
-       int *(*errno_location)(void);
        volatile int threads_minus_1;
-       int (*rsyscall)(int, long, long, long, long, long, long);
-       void (**tsd_keys)(void *);
-       void (*fork_handler)(int);
-} libc;
+       int canceldisable;
+       FILE *ofl_head;
+       int ofl_lock[2];
+};
+
+
+#if !defined(__PIC__) || 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
+
+#ifdef __PIC__
+#if __GNUC__ < 4
+#define BROKEN_VISIBILITY 1
+#endif
+#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden"))) 
+#else
+#define ATTR_LIBC_VISIBILITY
+#endif
+
+extern struct __libc __libc ATTR_LIBC_VISIBILITY;
+#define libc __libc
+
+#else
+
+#define USE_LIBC_ACCESSOR
+#define ATTR_LIBC_VISIBILITY
+extern struct __libc *__libc_loc(void) __attribute__((const));
+#define libc (*__libc_loc())
+
+#endif
 
 
 /* Designed to avoid any overhead in non-threaded processes */
 void __lock(volatile int *);
+void __unlock(volatile int *);
+int __lockfile(FILE *);
+void __unlockfile(FILE *);
 #define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
-#define UNLOCK(x) (*(x)=0)
-#define CANCELPT(x) (libc.cancelpt ? libc.cancelpt((x)),0 : (void)(x),0)
-#define CANCELPT_BEGIN CANCELPT(1)
-#define CANCELPT_END CANCELPT(0)
+#define UNLOCK(x) (libc.threads_minus_1 ? (__unlock(x),1) : ((void)(x),1))
+
+void __synccall(void (*)(void *), void *);
+void __synccall_wait(void);
+int __setxid(int, int, int, int);
 
 extern char **__environ;
 #define environ __environ