X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fwchar_.h;h=6e04ccca7f278e3e37ff85a78881e76281c0d1a7;hb=fa662f811f9a6dda54f64639b107b1637c3ba2e5;hp=f58af2f147c453c2f92e02082b3dd62e705ba6ff;hpb=ab681e53f8100fdb144e0a100d6f2da9ff7c005f;p=gnulib.git

diff --git a/lib/wchar_.h b/lib/wchar_.h
index f58af2f14..6e04ccca7 100644
--- a/lib/wchar_.h
+++ b/lib/wchar_.h
@@ -25,13 +25,7 @@
  * For now, this just ensures proper prerequisite inclusion order.
  */
 
-#if @HAVE_INCLUDE_NEXT@
-# include <stdio.h>
-# include_next <wchar.h>
-#endif
-
 #ifndef _GL_WCHAR_H
-#define _GL_WCHAR_H
 
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
@@ -41,9 +35,19 @@
 #include <stdio.h>
 #include <time.h>
 
-/* Include the original <wchar.h>.  */
-#if ! @HAVE_INCLUDE_NEXT@
-# include @ABSOLUTE_WCHAR_H@
+/* Include the original <wchar.h> if it exists.
+   Some builds of uClibc lack it.  */
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_WCHAR_H@
+# if @HAVE_INCLUDE_NEXT@
+#  include_next <wchar.h>
+# else
+#  include @ABSOLUTE_WCHAR_H@
+# endif
 #endif
 
+#ifndef _GL_WCHAR_H
+#define _GL_WCHAR_H
+
+#endif /* _GL_WCHAR_H */
 #endif /* _GL_WCHAR_H */