X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=06ba73e7fb685bb0fffcd6398e87d06c1d5a6765;hb=1bc44a473431228f5b46652740cb967a0de16e9e;hp=be88dc04c28cafd6a02c3ed73f6a70b4a8fb67a2;hpb=729cb49f52c825ac44f437e1ff0865d9f0b3626a;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index be88dc04..06ba73e7 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -6,11 +6,10 @@
 
 struct __libc {
 	int *(*errno_location)(void);
-	void (*cancelpt)(int);
-	void (*lock)(volatile int *);
-	void (*lockfile)(FILE *);
+	void (*testcancel)(void);
+	int threaded;
+	int canceldisable;
 	void (*fork_handler)(int);
-	int (*rsyscall)(int, long, long, long, long, long, long);
 	int (*atexit)(void (*)(void));
 	void (*fini)(void);
 	void (*ldso_fini)(void);
@@ -40,13 +39,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 CANCELPT_INHIBIT CANCELPT(2)
-#define CANCELPT_RESUME CANCELPT(-2)
+#define UNLOCK(x) (*(volatile int *)(x)=0)
+
+int __rsyscall(int, long, long, long, long, long, long);
 
 extern char **__environ;
 #define environ __environ