From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 26 Jul 2005 23:05:03 +0000 (-0000)
Subject: 2005-04-05  Shaun Jackman  <sjackman@gmail.com>
X-Git-Tag: 1_1_0~875
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6fafa5aa9f3a8efd4dd88f152ea46d4f1f69476b;p=oweals%2Fbusybox.git

2005-04-05  Shaun Jackman  <sjackman@gmail.com>

	* libbb/printf.c: Check for __NEWLIB_H__ before __GLIBC__.
---

diff --git a/libbb/printf.c b/libbb/printf.c
index 1156da911..4451273ef 100644
--- a/libbb/printf.c
+++ b/libbb/printf.c
@@ -71,9 +71,18 @@
 #define SET_FERROR_UNLOCKED(S)    ((S)->mode |= __MODE_ERR)
 
 # else
-#error unknown uClibc stdio implemenation!
+#  error unknown uClibc stdio implemenation!
 # endif
 
+#elif defined(__NEWLIB_H__)
+/* I honestly don't know if there are different versions of stdio in
+ * newlibs history.  Anyway, here's what's current.
+ * #define __sfeof(p)      (((p)->_flags & __SEOF) != 0)
+ * #define __sferror(p)    (((p)->_flags & __SERR) != 0)
+ * #define __sclearerr(p)  ((void)((p)->_flags &= ~(__SERR|__SEOF)))
+ */
+# define SET_FERROR_UNLOCKED(S)    ((S)->_flags |= __SERR)
+
 #elif defined(__GLIBC__)
 
 # if defined(_STDIO_USES_IOSTREAM)
@@ -81,7 +90,7 @@
  * #define _IO_feof_unlocked(__fp) (((__fp)->_flags & _IO_EOF_SEEN) != 0)
  * #define _IO_ferror_unlocked(__fp) (((__fp)->_flags & _IO_ERR_SEEN) != 0)
  */
-#define SET_FERROR_UNLOCKED(S)    ((S)->_flags |= _IO_ERR_SEEN)
+#  define SET_FERROR_UNLOCKED(S)    ((S)->_flags |= _IO_ERR_SEEN)
 
 # else
 /* Assume the older version of glibc which used a bitfield entry
@@ -90,19 +99,10 @@
  * #define feof_unlocked(stream)         ((stream)->__eof != 0)
  * #define ferror_unlocked(stream)       ((stream)->__error != 0)
  */
-#define SET_FERROR_UNLOCKED(S)    ((S)->__error = 1)
+#  define SET_FERROR_UNLOCKED(S)    ((S)->__error = 1)
 
 # endif
 
-#elif defined(__NEWLIB_H__)
-/* I honestly don't know if there are different versions of stdio in
- * newlibs history.  Anyway, here's what's current.
- * #define __sfeof(p)      (((p)->_flags & __SEOF) != 0)
- * #define __sferror(p)    (((p)->_flags & __SERR) != 0)
- * #define __sclearerr(p)  ((void)((p)->_flags &= ~(__SERR|__SEOF)))
- */
-#define SET_FERROR_UNLOCKED(S)    ((S)->_flags |= __SERR)
-
 #elif defined(__dietlibc__)
 /*
  *     WARNING!!!  dietlibc is quite buggy.  WARNING!!!
@@ -120,13 +120,13 @@
  * you can extract the information you need from dietstdio.h.  See the
  * other library implementations for examples.
  */
-#error dietlibc is currently not supported.  Please see the commented source.
+# error dietlibc is currently not supported.  Please see the commented source.
 
 #else /* some other lib */
 /* Please see the comments for the above supported libraries for examples
  * of what is required to support your stdio implementation.
  */
-#error Your stdio library is currently not supported.  Please see the commented source.
+# error Your stdio library is currently not supported.  Please see the commented source.
 #endif
 
 #ifdef L_bb_vfprintf