__GNU_LIBRARY__ is deprecated.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 7859d9bf4a07bf12af2c66974cc060215ecd077d..3d7b18762b8a3db01c7d8f8d60afb02ecf82d566 100644 (file)
--- 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 a37097084a9e443316ebdbd48270925ea27068eb..e1b4615a057029de56590c5387834ba733ed626d 100644 (file)
--- 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