From: Bruno Haible Date: Tue, 6 Mar 2001 22:03:09 +0000 (+0000) Subject: Avoid LC_MESSAGES redefinition warning on Solaris. X-Git-Tag: v0.10.36~131 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10927a7fc6621699b55b73308fb3a31899618759;p=thirdparty%2Fgettext.git Avoid LC_MESSAGES redefinition warning on Solaris. --- diff --git a/intl/ChangeLog b/intl/ChangeLog index fc0c1f63d..183831bac 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,7 @@ +2001-03-06 Bruno Haible + + * libgnuintl.h (LC_MESSAGES): Don't define on Solaris. + 2001-02-24 Bruno Haible * dcigettext.c: Update comment about HAVE_LOCALE_NULL. diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h index 8fbf4abee..7a11c65ff 100644 --- 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, defines __LOCALE_H then includes (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