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 02b309042fd8077c79c610761093c85100868c8e..2de06e2cf0ca0f522d62b848427dd5a700afb2dc 100644 (file)
--- 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