diff options
| author | Bruno Haible <bruno@clisp.org> | 2005-02-24 20:12:45 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2005-02-24 20:12:45 +0000 |
| commit | 9d7022aa0d04ad3139abeff943ce18aab3e751be (patch) | |
| tree | 39efc61c5e8924d7750f28594fbe08b3df00afb7 /lib/gettext.h | |
| parent | d427c96ee152df514e6eb0f73dd4f65021961bca (diff) | |
| download | gnulib-9d7022aa0d04ad3139abeff943ce18aab3e751be.tar.gz | |
Update from GNU gettext 0.14.2.
Diffstat (limited to 'lib/gettext.h')
| -rw-r--r-- | lib/gettext.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/gettext.h b/lib/gettext.h index 835732e01f..a0606dde54 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -36,6 +36,16 @@ # include <locale.h> #endif +/* 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 (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H +# include <libintl.h> +# endif +#endif + /* Disabled NLS. The casts to 'const char *' serve the purpose of producing warnings for invalid uses of the value returned from these functions. |