diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-10-16 12:25:27 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-10-29 10:41:30 -0600 |
| commit | aee17e424f491173bb377b97c397bca1604bf5b8 (patch) | |
| tree | 37d19060157ff961f0748e31c2ad9eb94dd47e0e /gdb | |
| parent | 9ac6985971f0af43d4dd385798db42eecb4ea98b (diff) | |
| download | gdb-aee17e424f491173bb377b97c397bca1604bf5b8.zip gdb-aee17e424f491173bb377b97c397bca1604bf5b8.tar.gz gdb-aee17e424f491173bb377b97c397bca1604bf5b8.tar.bz2 | |
undef reg in gdb_curses.h
I tried to build gdb on the AIX machine in the GCC compile farm
(gcc111), but it failed in a couple of spots because gdb uses "reg" as
a variable name and the AIX <curses.h> defines "reg" to "register".
I saw that we already had a workaround for this lurking in utils.c, so
I just moved that to gdb_curses.h.
This fixed the problem on AIX and still builds on x86-64 Fedora 18.
2013-10-29 Tom Tromey <tromey@redhat.com>
* utils.c (reg): Move undefinition...
* gdb_curses.h: ... here. Update comment to mention AIX.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdb_curses.h | 8 | ||||
| -rw-r--r-- | gdb/utils.c | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 23a2162..daceab8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-10-29 Tom Tromey <tromey@redhat.com> + + * utils.c (reg): Move undefinition... + * gdb_curses.h: ... here. Update comment to mention AIX. + 2013-10-29 Nicolas Blanc <nicolas.blanc@intel.com> * exec.h (add_target_sections_of_objfile): New declaration. diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h index 37b2d5b..92c6db1 100644 --- a/gdb/gdb_curses.h +++ b/gdb/gdb_curses.h @@ -54,4 +54,12 @@ extern int tgetnum (const char *); #endif +/* SunOS's curses.h has a '#define reg register' in it. Thank you Sun. */ +/* Ditto for: + -bash-4.2$ uname -a + AIX power-aix 1 7 00F84C0C4C00 */ +#ifdef reg +#undef reg +#endif + #endif /* gdb_curses.h */ diff --git a/gdb/utils.c b/gdb/utils.c index 47f9dfe..1986758 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -40,11 +40,6 @@ #include <pc.h> #endif -/* SunOS's curses.h has a '#define reg register' in it. Thank you Sun. */ -#ifdef reg -#undef reg -#endif - #include <signal.h> #include "timeval-utils.h" #include "gdbcmd.h" |