X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=d6df93d0a40cf9a79fe35c0a11f1db97ece05fb3;hb=ebf82447be4b30bedc19ad868c3a0662b1ba596d;hp=ea221b6f9a4deeaba93e0879aeb333298009401f;hpb=e9417fffb39c299e556c5ad0c1545f0c02618e3c;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index ea221b6f..d6df93d0 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -4,28 +4,45 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#define libc __libc
-extern struct libc {
+struct __libc {
+	int *(*errno_location)(void);
+	void (*testcancel)(void);
 	void (*lock)(volatile int *);
-	void (*cancelpt)(int);
+	void (*lockfile)(FILE *);
+	void (*fork_handler)(int);
 	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 ofl_lock;
+	FILE *ofl_head;
+	int canceldisable;
+};
+
+
+#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
+extern struct __libc __libc __attribute__((visibility("hidden")));
+#define libc __libc
+
+#elif !defined(__PIC__)
+extern struct __libc __libc;
+#define libc __libc
+
+#else
+#define USE_LIBC_ACCESSOR
+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 __lockfile(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)
+
+int __rsyscall(int, long, long, long, long, long, long);
 
 extern char **__environ;
 #define environ __environ