X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=3f1e55e53ac5e4556c2becced197b75e8203f55b;hb=feee98903cd8119d9a3db62589246a940f44a9f5;hp=c83fcafe456953b8ddd88ada9ae515ff658396e6;hpb=bf619d82c82052741323aa63c107fbd346c8aaba;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index c83fcafe..3f1e55e5 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,20 +5,17 @@
 #include <stdio.h>
 
 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);
-	FILE *ofl_head;
 	int ofl_lock;
-	void (*lockfile)(FILE *);
-	void (*sigtimer)();
+	FILE *ofl_head;
 };
 
 
@@ -43,10 +40,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