diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/asintl.h | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 65c7e7a..1617d2b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2005-09-30 Matthias Kurz <mk@baerlap.north.de> + + * asintl.h: Prevent the inclusion of <libintl.h> from the Solaris + version of <locale.h> when ENABLE_NLS is not defined. + 2005-09-29 Jan Beulich <jbeulich@novell.com> * config/tc-ia64.c (parse_operands): Always parse first operand of diff --git a/gas/asintl.h b/gas/asintl.h index 3b40aa3..67ce0dd 100644 --- a/gas/asintl.h +++ b/gas/asintl.h @@ -1,5 +1,5 @@ /* asintl.h - gas-specific header for gettext code. - Copyright 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2005 Free Software Foundation, Inc. Written by Tom Tromey <tromey@cygnus.com> @@ -21,6 +21,15 @@ 02110-1301, USA. */ #ifdef HAVE_LOCALE_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 # include <locale.h> #endif |