mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-04-24 14:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

asintl.h/bucomm.h/ld.h: Prevent the inclusion of <libintl.h> from the Solaris

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

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

12
binutils/bucomm.h
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

5
gas/ChangeLog
View File

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

11
gas/asintl.h
View File

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

5
gprof/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-30 Matthias Kurz <mk@baerlap.north.de>
* gprof.c (main):Only invoke bindtextdomain() and textdomain() if
ENABLE_NLS is defined.
2005-05-09 Nick Clifton <nickc@redhat.com>
* Update the address and phone number of the FSF organization in

2
gprof/gprof.c
View File

@ -189,8 +189,10 @@ main (int argc, char **argv)
#if defined (HAVE_SETLOCALE)
setlocale (LC_CTYPE, "");
#endif
#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
#endif
whoami = argv[0];
xmalloc_set_program_name (whoami);

5
ld/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-30 Matthias Kurz <mk@baerlap.north.de>
* ld.h: Prevent the inclusion of <libintl.h> from the Solaris
version of <locale.h> when ENABLE_NLS is not defined.
2005-09-27 H.J. Lu <hongjiu.lu@intel.com>
* ld.texinfo (ALIGN): Document it as forcing output section

36
ld/ld.h
View File

@ -24,6 +24,42 @@
#define LD_H
#ifdef HAVE_LOCALE_H
#endif
#ifndef SEEK_CUR
#define SEEK_CUR 1
#endif
#ifndef SEEK_END
#define SEEK_END 2
#endif
#if defined(__GNUC__) && !defined(C_ALLOCA)
# undef alloca
# define alloca __builtin_alloca
#else
# if defined(HAVE_ALLOCA_H) && !defined(C_ALLOCA)
# include <alloca.h>
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
# if !defined (__STDC__) && !defined (__hpux)
char *alloca ();
# else
void *alloca ();
# endif /* __STDC__, __hpux */
# endif /* 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