From: Bruno Haible <bruno@clisp.org>
Date: Tue, 23 Nov 2004 17:53:09 +0000 (+0000)
Subject: Tweak last patch so that it also works with g++ 3.3 on glibc systems.
X-Git-Tag: v0.14.2~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03e47aeb30de60519eb3a0660762e354f15cab25;p=thirdparty%2Fgettext.git

Tweak last patch so that it also works with g++ 3.3 on glibc systems.
---

diff --git a/gettext-tools/lib/gettext.h b/gettext-tools/lib/gettext.h
index 02b309042..2de06e2cf 100644
--- a/gettext-tools/lib/gettext.h
+++ b/gettext-tools/lib/gettext.h
@@ -37,12 +37,12 @@
 # include <locale.h>
 #endif
 
-/* Many header files from the libstdc++ coming with g++ 3.4 or newer include
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
    <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
    it now, to make later inclusions of <libintl.h> a NOP.  */
 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
 # include <cstdlib>
-# if _GLIBCXX_HAVE_LIBINTL_H
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
 #  include <libintl.h>
 # endif
 #endif