From: Bruno Haible <bruno@clisp.org>
Date: Thu, 29 Nov 2001 13:20:41 +0000 (+0000)
Subject: Merge with glibc: modify a #if.
X-Git-Tag: v0.11~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bffcfd4bbda6b52ba9f34ccd9c82b64419644e11;p=thirdparty%2Fgettext.git

Merge with glibc: modify a #if.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 2577b6e86..9fbae8f82 100644
--- 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 c7c10b249..2ab05f273 100644
--- 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