From: Bruno Haible <bruno@clisp.org>
Date: Thu, 14 Apr 2011 20:29:41 +0000 (+0200)
Subject: wchar: Ensure that wchar_t gets defined on uClibc.
X-Git-Tag: v0.1~2944
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=93dca9da5d488fcf40c38f63d9762a9f54b1a8b0;p=gnulib.git

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 09f68af28..349e5fc77 100644
--- 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 d2bf17d6e..c7f306a9c 100644
--- 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