fix minor bugs due to incorrect threaded-predicate semantics

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 3d09bf6..638ea52 100644 (file)
--- 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,10 +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_END CANCELPT(0)
+#define UNLOCK(x) (*(volatile int *)(x)=0)
+
+int __rsyscall(int, long, long, long, long, long, long);
 
 extern char **__environ;
 #define environ __environ