diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-04-17 16:53:54 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-04-17 16:53:54 -0400 |
| commit | 9080cc153cc2b09881c3245becbd68534db18d7c (patch) | |
| tree | ddbc5aef325120e000b8e7d852f26322791deb55 /src/internal | |
| parent | eb0e8fa0b1960cff4bd65ebefc798f70273b0bc9 (diff) | |
| download | musl-9080cc153cc2b09881c3245becbd68534db18d7c.tar.gz | |
clean up handling of thread/nothread mode, locking
Diffstat (limited to 'src/internal')
| -rw-r--r-- | src/internal/libc.h | 7 | ||||
| -rw-r--r-- | src/internal/stdio_impl.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/internal/libc.h b/src/internal/libc.h index d6df93d0..06ba73e7 100644 --- a/src/internal/libc.h +++ b/src/internal/libc.h @@ -7,8 +7,8 @@ struct __libc { int *(*errno_location)(void); void (*testcancel)(void); - void (*lock)(volatile int *); - void (*lockfile)(FILE *); + int threaded; + int canceldisable; void (*fork_handler)(int); int (*atexit)(void (*)(void)); void (*fini)(void); @@ -16,7 +16,6 @@ struct __libc { volatile int threads_minus_1; int ofl_lock; FILE *ofl_head; - int canceldisable; }; @@ -40,7 +39,7 @@ 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 UNLOCK(x) (*(volatile int *)(x)=0) int __rsyscall(int, long, long, long, long, long, long); diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h index 90a8214b..76b58be9 100644 --- a/src/internal/stdio_impl.h +++ b/src/internal/stdio_impl.h @@ -24,7 +24,7 @@ #define UNGET 8 -#define FLOCK(f) ((libc.lockfile && (f)->lock>=0) ? (libc.lockfile((f)),0) : 0) +#define FLOCK(f) ((libc.threads_minus_1 && (f)->lock>=0) ? (__lockfile((f)),0) : 0) #define FUNLOCK(f) ((f)->lockcount && (--(f)->lockcount || ((f)->lock=0))) #define F_PERM 1 |