[BusyBox-cvs] busybox/libbb printf.c,1.2,1.3

Manuel Novoa III mjn3 at busybox.net
Fri Jan 30 21:44:23 UTC 2004


Update of /var/cvs/busybox/libbb
In directory nail:/tmp/cvs-serv6315

Modified Files:
	printf.c 
Log Message:
Support new uClibc stdio core.


Index: printf.c
===================================================================
RCS file: /var/cvs/busybox/libbb/printf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- printf.c	16 Apr 2003 23:02:35 -0000	1.2
+++ printf.c	30 Jan 2004 21:44:20 -0000	1.3
@@ -55,9 +55,13 @@
  * #define __FEOF(stream)		((stream)->modeflags & __FLAG_EOF)
  * #define __FERROR(stream)	((stream)->modeflags & __FLAG_ERROR)
  */
-#define SET_FERROR_UNLOCKED(S)    ((S)->modeflags |= __FLAG_ERROR)
+#  if defined(__MASK_READING)
+#   define SET_FERROR_UNLOCKED(S)    ((S)->__modeflags |= __FLAG_ERROR)
+#  else
+#   define SET_FERROR_UNLOCKED(S)    ((S)->modeflags |= __FLAG_ERROR)
+#  endif
 
-#elif defined(__MODE_ERR)
+# elif defined(__MODE_ERR)
 /* Using either the original stdio implementation (from dev86) or
  * my original stdio rewrite.  Macros were:
  * #define ferror(fp)	(((fp)->mode&__MODE_ERR) != 0)
@@ -66,9 +70,9 @@
  */
 #define SET_FERROR_UNLOCKED(S)    ((S)->mode |= __MODE_ERR)
 
-#else
+# else
 #error unknown uClibc stdio implemenation!
-#endif
+# endif
 
 #elif defined(__GLIBC__)
 




More information about the busybox-cvs mailing list