X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=b80cbcc9ef61e033e41cd796abace1f465642e75;hb=2f3d02cd83a46244c3f5a6fec851d7eded1376f4;hp=8a84be0b90f144ccc661921c1e1553f7119d72fe;hpb=d89c9e8a63018810bb6a3e2ae55604996cc21e7b;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 8a84be0b..b80cbcc9 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,34 +5,46 @@
 #include <stdio.h>
 
 struct __libc {
-	void (*lock)(volatile int *);
+	int *(*errno_location)(void);
 	void (*cancelpt)(int);
+	void (*lock)(volatile int *);
+	void (*lockfile)(FILE *);
+	void (*fork_handler)(int);
+	int (*rsyscall)(int, long, long, long, long, long, long);
 	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);
+	int ofl_lock;
+	FILE *ofl_head;
 };
 
-#ifdef __PIC__
-extern struct __libc *__libc_loc(void) __attribute__((const));
-#define libc (*__libc_loc())
-#else
+
+#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)
+#define CANCELPT_TRY CANCELPT(0)
+#define CANCELPT_END CANCELPT(-1)
 
 extern char **__environ;
 #define environ __environ