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.
This commit is contained in:
Nick Clifton
2005-09-30 11:42:05 +00:00
parent 7fe2b9a6a6
commit a70c240376
8 changed files with 79 additions and 2 deletions

View File

@@ -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