projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs in cancellable syscall asm
[musl]
/
src
/
internal
/
libc.h
diff --git
a/src/internal/libc.h
b/src/internal/libc.h
index
60a25ef
..
d6df93d
100644
(file)
--- a/
src/internal/libc.h
+++ b/
src/internal/libc.h
@@
-6,19
+6,17
@@
struct __libc {
int *(*errno_location)(void);
struct __libc {
int *(*errno_location)(void);
- void (*
cancelpt)(int
);
+ void (*
testcancel)(void
);
void (*lock)(volatile int *);
void (*lockfile)(FILE *);
void (*lock)(volatile int *);
void (*lockfile)(FILE *);
- void (**tsd_keys)(void *);
- void (*sigtimer)();
+ void (*fork_handler)(int);
int (*atexit)(void (*)(void));
void (*fini)(void);
void (*ldso_fini)(void);
volatile int threads_minus_1;
int ofl_lock;
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);
- void (*fork_handler)(int);
FILE *ofl_head;
FILE *ofl_head;
+ int canceldisable;
};
};
@@
-43,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)
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
extern char **__environ;
#define environ __environ