diff options
| author | Nick Clifton <nickc@redhat.com> | 2005-09-30 11:42:05 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2005-09-30 11:42:05 +0000 |
| commit | a70c240376fbfde088944325cc58a0e9edba6cc5 (patch) | |
| tree | 7a7fc819d79f97c05d8089d9f8a4032877677c4c /binutils | |
| parent | 7fe2b9a6a674d57789207d7f14fb2f0573bcc8f5 (diff) | |
| download | gdb-a70c240376fbfde088944325cc58a0e9edba6cc5.zip gdb-a70c240376fbfde088944325cc58a0e9edba6cc5.tar.gz gdb-a70c240376fbfde088944325cc58a0e9edba6cc5.tar.bz2 | |
asintl.h/bucomm.h/ld.h: Prevent the inclusion of <libintl.h> from the Solaris
version of <locale.h> when ENABLE_NLS is not defined.
gprof.c (main):Only invoke bindtextdomain() and textdomain() if ENABLE_NLS is
defined.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/bucomm.h | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 7f7a7f4..d98b20e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2005-09-30 Matthias Kurz <mk@baerlap.north.de> + + * bucomm.h: Prevent the inclusion of <libintl.h> from the Solaris + version of <locale.h> when ENABLE_NLS is not defined. + 2005-09-26 Mark Mitchell <mark@codesourcery.com> * BRANCHES: Mention binutils-csl-gxxpro-3_4-branch. diff --git a/binutils/bucomm.h b/binutils/bucomm.h index 0872e96..2c662c8 100644 --- a/binutils/bucomm.h +++ b/binutils/bucomm.h @@ -1,6 +1,6 @@ /* bucomm.h -- binutils common include file. Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003 Free Software Foundation, Inc. + 2001, 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -125,7 +125,17 @@ void *alloca (); # endif /* HAVE_ALLOCA_H */ #endif + #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 |