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 | fcf58c854763300a75e9cee7a3bf5222819c6934 (patch) | |
| tree | 3838a7a7cf48d154bb612010310497973cf474c0 /binutils/bucomm.h | |
| parent | f9982860d4c081bf9c41daf5a1f211bed2d405b1 (diff) | |
| download | binutils-redhat-fcf58c854763300a75e9cee7a3bf5222819c6934.tar.gz | |
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/bucomm.h')
| -rw-r--r-- | binutils/bucomm.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/binutils/bucomm.h b/binutils/bucomm.h index 0872e96e69..2c662c8e0a 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 |