From: Bruno Haible <bruno@clisp.org>
Date: Wed, 25 Oct 2006 11:43:26 +0000 (+0000)
Subject: __GNU_LIBRARY__ is deprecated.
X-Git-Tag: 0.16.x-branchpoint~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6652293e8c7176094f86b44354101db2d556175;p=thirdparty%2Fgettext.git

__GNU_LIBRARY__ is deprecated.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 7859d9bf4..3d7b18762 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -2,6 +2,11 @@
 
 	* gettext-0.16 released.
 
+2006-10-24  Bruno Haible  <bruno@clisp.org>
+
+	* localename.c (HAVE_LOCALE_NULL): Test __GLIBC__ instead of
+	__GNU_LIBRARY__.
+
 2006-10-24  Bruno Haible  <bruno@clisp.org>
 
 	* libgnuintl.h.in (LIBINTL_VERSION): Bump to 0.16.
diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index a37097084..e1b4615a0 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -973,7 +973,7 @@ _nl_locale_name_canonicalize (char *name)
    However it does not specify the exact format.  Neither do SUSV2 and
    ISO C 99.  So we can use this feature only on selected systems (e.g.
    those using GNU C Library).  */
-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
+#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2)
 # define HAVE_LOCALE_NULL
 #endif