diff options
| -rw-r--r-- | gold/ChangeLog | 4 | ||||
| -rw-r--r-- | gold/gold.h | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 7037625..657f644 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,9 @@ 2008-07-24 Ian Lance Taylor <iant@google.com> + PR 6716 + * gold.h: Always include <clocale>. Add Solaris workarounds + following code in binutils/sysdep.h. + PR 6048 * ehframe.cc (Eh_frame::add_ehframe_input_section): Check whether this->eh_frame_hdr_ is NULL before using it. diff --git a/gold/gold.h b/gold/gold.h index 03e73d3..63df994 100644 --- a/gold/gold.h +++ b/gold/gold.h @@ -29,6 +29,20 @@ #include <cstddef> #include <sys/types.h> +#ifndef ENABLE_NLS + // The Solaris version of locale.h always includes libintl.h. If we + // have been configured with --disable-nls then ENABLE_NLS will not + // be defined and the dummy definitions of bindtextdomain (et al) + // below will conflict with the defintions in libintl.h. So we + // define these values to prevent the bogus inclusion of libintl.h. +# define _LIBINTL_H +# define _LIBGETTEXT_H +#endif + +// Always include <clocale> first to avoid conflicts with the macros +// used when ENABLE_NLS is not defined. +#include <clocale> + #ifdef ENABLE_NLS # include <libintl.h> # define _(String) gettext (String) |