diff options
| author | Pedro Alves <palves@redhat.com> | 2016-09-19 16:55:35 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-09-19 16:55:35 +0100 |
| commit | 6679754127e51d9c3bd0e387fabbe4e71038c8ce (patch) | |
| tree | d9f56b6cb99f94ea0d8bcb276df68f6164aac2c0 /gdb/common | |
| parent | b19753ce31da347605dfa903c6fd2158e2444f0d (diff) | |
| download | gdb-6679754127e51d9c3bd0e387fabbe4e71038c8ce.zip gdb-6679754127e51d9c3bd0e387fabbe4e71038c8ce.tar.gz gdb-6679754127e51d9c3bd0e387fabbe4e71038c8ce.tar.bz2 | |
gdb: Fix build breakage with GCC 4.1 and --disable-nls
Ref: https://sourceware.org/ml/gdb-patches/2016-09/msg00203.html
The std::{min,max} patch caused build failures when configuring GDB
with with --disable-nls and using GCC 4.1.
The reason is this bit in common/gdb_locale.h:
#ifdef ENABLE_NLS
...
#else
# define gettext(Msgid) (Msgid)
...
#endif
This causes problems if the <libintl.h> header is first included at
any point after "gdb_locale.h".
Specifically, the gettext&co declarations in libintl.h:
extern char *gettext (__const char *__msgid)
__THROW __attribute_format_arg__ (1);
end up broken after preprocessing:
extern char *(__const char *__msgid)
throw () __attribute__ ((__format_arg__ (1)));
After the std::min/std::max change to include <algorithm>, this now
happens with at least the GCC 4.1 copy of <algorithm>, which includes
<libintl.h> via <bits/stl_algobase.h>, <iosfwd>, and
<bits/c++locale.h>.
The fix is to simply remove the troublesome *gettext and *textdomain
macros, leaving only the _ and N_ ones.
gdb/ChangeLog:
2016-09-19 Pedro Alves <palves@redhat.com>
* common/gdb_locale.h [!ENABLE_NLS] (gettext, dgettext, dcgettext,
textdomain, bindtextdomain): Delete macros.
* main.c (captured_main) [!ENABLE_NLS]: Skip bintextdomain and
textdomain calls.
Diffstat (limited to 'gdb/common')
| -rw-r--r-- | gdb/common/gdb_locale.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gdb/common/gdb_locale.h b/gdb/common/gdb_locale.h index 686260e..f9538a7 100644 --- a/gdb/common/gdb_locale.h +++ b/gdb/common/gdb_locale.h @@ -32,11 +32,6 @@ # define N_(String) (String) # endif #else -# define gettext(Msgid) (Msgid) -# define dgettext(Domainname, Msgid) (Msgid) -# define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) while (0) /* nothing */ -# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ # define _(String) (String) # define N_(String) (String) #endif |