Avoid LC_MESSAGES redefinition warning on Solaris.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index fc0c1f63d48163e64997556b9c2b3a7aa1176171..183831bac180e78128a5508da70f5f5d627d3d5b 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-06  Bruno Haible  <haible@clisp.cons.org>
+
+       * libgnuintl.h (LC_MESSAGES): Don't define on Solaris.
+
 2001-02-24  Bruno Haible  <haible@clisp.cons.org>
 
        * dcigettext.c: Update comment about HAVE_LOCALE_NULL.

diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
index 8fbf4abee2d0373ed4e2fcddccdba187c1affeda..7a11c65ffe3da0e54d759bb880bfb3040714cfa5 100644 (file)
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.h
@@ -22,8 +22,11 @@
 
 /* The LC_MESSAGES locale category is the category used by the functions
    gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.  */
-#ifndef LC_MESSAGES
+   On systems that don't define it, use an arbitrary value instead.
+   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
+   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
+   warning, don't define LC_MESSAGES in this case.  */
+#if !defined LC_MESSAGES && !defined __LOCALE_H
 # define LC_MESSAGES 1729
 #endif