# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1306609094 -7200
# Node ID d6cca2f0c24066d232d58c3abe2e936940036da5
# Parent  c2b5c400a9919e8642d5656358c4fab55d38c8c1
wctype-h: Avoid namespace pollution on Solaris 2.6.

* lib/wctype.in.h: On Solaris, undefine 'multibyte' and a few other
identifiers.
* doc/posix-headers/wctype.texi: Mention the problem.
Reported by Tom G. Christensen <tgc@jupiterrise.com>.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-29  Bruno Haible  <bruno@clisp.org>
+
+	wctype-h: Avoid namespace pollution on Solaris 2.6.
+	* lib/wctype.in.h: On Solaris, undefine 'multibyte' and a few other
+	identifiers.
+	* doc/posix-headers/wctype.texi: Mention the problem.
+	Reported by Tom G. Christensen <tgc@jupiterrise.com>.
+
 2011-05-28  Jim Meyering  <meyering@redhat.com>
 
 	parse-datetime.y: accommodate -Wstrict-overflow
diff --git a/doc/posix-headers/wctype.texi b/doc/posix-headers/wctype.texi
--- a/doc/posix-headers/wctype.texi
+++ b/doc/posix-headers/wctype.texi
@@ -25,6 +25,10 @@
 @item
 The functions @code{isw*} are actually defined as macros that don't work,
 on IRIX 5.3.
+@item
+This header file defines some identifiers, such as @code{multibyte}, as macros
+on some platforms:
+Solaris 2.6.
 @end itemize
 
 Portability problems not fixed by Gnulib:
diff --git a/lib/wctype.in.h b/lib/wctype.in.h
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -59,6 +59,19 @@
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
+/* Solaris 2.6 <wctype.h> includes <widec.h> which includes <euc.h> which
+   #defines a number of identifiers in the application namespace.  Revert
+   these #defines.  */
+#ifdef __sun
+# undef multibyte
+# undef eucw1
+# undef eucw2
+# undef eucw3
+# undef scrw1
+# undef scrw2
+# undef scrw3
+#endif
+
 /* Define wint_t and WEOF.  (Also done in wchar.in.h.)  */
 #if !@HAVE_WINT_T@ && !defined wint_t
 # define wint_t int