X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Fstdio_impl.h;h=0b2438d613fe9d65c9f124358cbc7a8ca4a3cbc6;hb=25e6fee27f4a293728dd15b659170e7b9c7db9bc;hp=92f7be6ce345a18fa48462e99f1c1fc5b0b788ab;hpb=a3944d3f0cfc63ebfcd9dad4dd7f2b2cd8860968;p=musl

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 92f7be6c..0b2438d6 100644
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -3,7 +3,6 @@
 
 #include <stdio.h>
 #include "syscall.h"
-#include "libc.h"
 
 #define UNGET 8
 
@@ -35,11 +34,9 @@ struct _IO_FILE {
 	int fd;
 	int pipe_pid;
 	long lockcount;
-	short dummy3;
-	signed char mode;
-	signed char lbf;
+	int mode;
 	volatile int lock;
-	volatile int waiters;
+	int lbf;
 	void *cookie;
 	off_t off;
 	char *getln_buf;
@@ -54,14 +51,15 @@ extern hidden FILE *volatile __stdin_used;
 extern hidden FILE *volatile __stdout_used;
 extern hidden FILE *volatile __stderr_used;
 
+hidden int __lockfile(FILE *);
+hidden void __unlockfile(FILE *);
+
 hidden size_t __stdio_read(FILE *, unsigned char *, size_t);
 hidden size_t __stdio_write(FILE *, const unsigned char *, size_t);
 hidden size_t __stdout_write(FILE *, const unsigned char *, size_t);
 hidden off_t __stdio_seek(FILE *, off_t, int);
 hidden int __stdio_close(FILE *);
 
-hidden size_t __string_read(FILE *, unsigned char *, size_t);
-
 hidden int __toread(FILE *);
 hidden int __towrite(FILE *);
 
@@ -92,17 +90,20 @@ hidden void __register_locked_file(FILE *, struct __pthread *);
 hidden void __unlist_locked_file(FILE *);
 hidden void __do_orphaned_stdio_locks(void);
 
+#define MAYBE_WAITERS 0x40000000
+
 hidden void __getopt_msg(const char *, const char *, const char *, size_t);
 
 #define feof(f) ((f)->flags & F_EOF)
 #define ferror(f) ((f)->flags & F_ERR)
 
 #define getc_unlocked(f) \
-	( ((f)->rpos < (f)->rend) ? *(f)->rpos++ : __uflow((f)) )
+	( ((f)->rpos != (f)->rend) ? *(f)->rpos++ : __uflow((f)) )
 
 #define putc_unlocked(c, f) \
-	( ((unsigned char)(c)!=(f)->lbf && (f)->wpos<(f)->wend) \
-	? *(f)->wpos++ = (c) : __overflow((f),(c)) )
+	( (((unsigned char)(c)!=(f)->lbf && (f)->wpos!=(f)->wend)) \
+	? *(f)->wpos++ = (unsigned char)(c) \
+	: __overflow((f),(unsigned char)(c)) )
 
 /* Caller-allocated FILE * operations */
 hidden FILE *__fopen_rb_ca(const char *, FILE *, unsigned char *, size_t);