wchar: Ensure that wchar_t gets defined on uClibc.

* lib/wchar.in.h: On uClibc, include <stddef.h>.
Reported by Giuseppe Scrivano <gscrivano@gnu.org>.

diff --git a/ChangeLog b/ChangeLog
index 09f68af28794808d22c6b169b912a3726d6ee637..349e5fc77de9bdea79c9407426462f6443f3561f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-14  Bruno Haible  <bruno@clisp.org>
+
+       wchar: Ensure that wchar_t gets defined on uClibc.
+       * lib/wchar.in.h: On uClibc, include <stddef.h>.
+       Reported by Giuseppe Scrivano <gscrivano@gnu.org>.
+
 2011-04-13  Bruno Haible  <bruno@clisp.org>
 
        safe-write, full-read: Avoid unnecessary compilation units.

diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index d2bf17d6eb16e9956b6efbdbfbb65710dd9a2302..c7f306a9c0c2115654affbd528062e38032c6078 100644 (file)
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -61,9 +61,13 @@
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
    included before <wchar.h>.
+   In some builds of uClibc, <wchar.h> is nonexistent and wchar_t is defined
+   by <stddef.h>.
    But avoid namespace pollution on glibc systems.  */
-#ifndef __GLIBC__
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
 # include <stddef.h>
+#endif
+#ifndef __GLIBC__
 # include <stdio.h>
 # include <time.h>
 #endif