X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Fstdio_impl.h;h=c5f45eb1eed42df486fbe1c3bd29e7fb7a0df524;hp=76b58be9fb6c6aaa11a2a240f66df99947f9cba5;hb=dba68bf98fc708cea4c478278c889fc7ad802b00;hpb=7683fceedebd98dda19b1a379b92406b64ce7f92

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 76b58be9..c5f45eb1 100644
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -24,8 +24,8 @@
 
 #define UNGET 8
 
-#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 FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0)
+#define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else
 
 #define F_PERM 1
 #define F_NORD 4
@@ -49,12 +49,12 @@ struct __FILE_s {
 	FILE *prev, *next;
 	int fd;
 	int pipe_pid;
-	long dummy2;
+	long lockcount;
 	short dummy3;
 	signed char mode;
 	signed char lbf;
 	int lock;
-	int lockcount;
+	int waiters;
 	void *cookie;
 	off_t off;
 	int (*flush)(FILE *);
@@ -86,7 +86,6 @@ FILE *__fdopen(int, const char *);
 
 #define OFLLOCK() LOCK(&libc.ofl_lock)
 #define OFLUNLOCK() UNLOCK(&libc.ofl_lock)
-#define ofl_head (libc.ofl_head)
 
 #define feof(f) ((f)->flags & F_EOF)
 #define ferror(f) ((f)->flags & F_ERR)