diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-02-26 07:31:20 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-02-26 07:31:20 +0000 |
| commit | f93ba587561d0fc84d779e86039427828956c77c (patch) | |
| tree | 6b7a194d7bed0aee63dc86bdcd911785dd0ba41b /lib/gettext.h | |
| parent | 641ef33fac78f3200c38c830bc6513062f3d3324 (diff) | |
| download | coreutils-f93ba587561d0fc84d779e86039427828956c77c.tar.xz | |
Sync from gnulib.
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 835732e01..a0606dde5 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. |