darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR 6716

Browse source 
* gold.h: Always include <clocale>.  Add Solaris workarounds
	following code in binutils/sysdep.h.
This commit is contained in:
Ian Lance Taylor 2008-07-24 21:45:50 +00:00
parent 5edd166e7d
commit 801647d1db
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gold/ChangeLog
View file

@ -1,5 +1,9 @@
2008-07-24 Ian Lance Taylor <iant@google.com>
PR 6716
* gold.h: Always include <clocale>. Add Solaris workarounds
following code in binutils/sysdep.h.
PR 6048
* ehframe.cc (Eh_frame::add_ehframe_input_section): Check whether
this->eh_frame_hdr_ is NULL before using it.

14
gold/gold.h
View file

@ -29,6 +29,20 @@
#include <cstddef>
#include <sys/types.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
// Always include <clocale> first to avoid conflicts with the macros
// used when ENABLE_NLS is not defined.
#include <clocale>
#ifdef ENABLE_NLS
# include <libintl.h>
# define _(String) gettext (String)