X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=638ea5270e38f5a449011edac0df9762b3a05865;hp=bbbb3a4cc8047682f4306ea7737df293dc6c762c;hb=870cc679771f776333953b2a990a107393d9d0fd;hpb=b470030f839a375e5030ec9d44903ef7581c15a2

diff --git a/src/internal/libc.h b/src/internal/libc.h
index bbbb3a4c..638ea527 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,19 +5,18 @@
 #include <stdio.h>
 
 struct __libc {
-	void (*lock)(volatile int *);
-	void (*cancelpt)(int);
+	int *(*errno_location)(void);
+	void (*testcancel)(void);
+	int threaded;
+	int canceldisable;
+	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);
-	FILE *ofl_head;
 	int ofl_lock;
-	void (*lockfile)(FILE *);
+	FILE *ofl_head;
+	void *main_thread;
 };
 
 
@@ -41,11 +40,9 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 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_TRY CANCELPT(0)
-#define CANCELPT_END CANCELPT(-1)
+#define UNLOCK(x) (*(volatile int *)(x)=0)
+
+int __rsyscall(int, long, long, long, long, long, long);
 
 extern char **__environ;
 #define environ __environ