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

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 6828f8b6..d6df93d0 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -6,18 +6,17 @@
 
 struct __libc {
 	int *(*errno_location)(void);
-	void (*cancelpt)(int);
+	void (*testcancel)(void);
 	void (*lock)(volatile int *);
 	void (*lockfile)(FILE *);
 	void (*fork_handler)(int);
-	void (*sigtimer)();
 	int (*atexit)(void (*)(void));
 	void (*fini)(void);
 	void (*ldso_fini)(void);
 	volatile int threads_minus_1;
 	int ofl_lock;
-	int (*rsyscall)(int, long, long, long, long, long, long);
 	FILE *ofl_head;
+	int canceldisable;
 };
 
 
@@ -42,10 +41,8 @@ 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)
+
+int __rsyscall(int, long, long, long, long, long, long);
 
 extern char **__environ;
 #define environ __environ