Avoid warning on Solaris 2.5.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index de8a5a94bd5d60dba288f51f1bb3371f5ac8424d..d99a9cdbcff0095819083cf15fb671ce9e0f9286 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-15  Bruno Haible  <bruno@clisp.org>
+
+       * libgnuintl.h (LC_MESSAGES): Don't define on Solaris 2.5, to avoid
+       a warning.
+       Reported by Stephen Gildea <gildea@stop.mail-abuse.org>.
+
 2002-03-12  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.11.1 released.

diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
index 7fd547ef04846016d98c0d03b5c4aafba038e0ed..1387e70c75be8787ea131c8f52ce7d0d44af2626 100644 (file)
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.h
@@ -1,5 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -24,10 +24,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.
-   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
+   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+   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 || (defined _LOCALE_H && defined __sun))
 # define LC_MESSAGES 1729
 #endif