Merge with glibc: modify a #if.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 2577b6e86a32b5fe43995fbab26d584d3ae3f154..9fbae8f82249804ec714765b73d2539b7c3cbae1 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-27  Ulrich Drepper  <drepper@redhat.com>
+
+       * loadmsgcat.c (_nl_init_domain_conv): Modify #if expression.
+
 2001-11-27  Ulrich Drepper  <drepper@redhat.com>
 
        * plural-eval.c (plural_eval): Rename back from PLURAL_EVAL.

diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index c7c10b249348cfd9601d247dd4ef8b1c755205f6..2ab05f273ccdfe4f53895b6b228fd38b2bafa798 100644 (file)
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -214,7 +214,8 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 #  if HAVE_ICONV
          /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
             we want to use transliteration.  */
-#   if (defined (__GNU_LIBRARY__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2))) || (_LIBICONV_VERSION >= 0x0105)
+#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
+       || _LIBICONV_VERSION >= 0x0105
          len = strlen (outcharset);
          {
            char *tmp = (char *) alloca (len + 10 + 1);
@@ -224,7 +225,8 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
          }
 #   endif
          domain->conv = iconv_open (outcharset, charset);
-#   if (defined (__GNU_LIBRARY__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2))) || (_LIBICONV_VERSION >= 0x0105)
+#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
+       || _LIBICONV_VERSION >= 0x0105
          freea (outcharset);
 #   endif
 #  endif