From: Tom Tromey <tromey@redhat.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@redhat.com>
Subject: [RFC] undef reg in gdb_curses.h
Date: Thu, 17 Oct 2013 15:46:00 -0000 [thread overview]
Message-ID: <1382024768-24151-1-git-send-email-tromey@redhat.com> (raw)
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.
Let me know what you think. I suppose in the absence of comments I
will put this in.
* utils.c (reg): Move undefinition...
* gdb_curses.h: ... here. Update comment to mention AIX.
---
gdb/gdb_curses.h | 8 ++++++++
gdb/utils.c | 5 -----
2 files changed, 8 insertions(+), 5 deletions(-)
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"
--
1.8.1.4
next reply other threads:[~2013-10-17 15:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-17 15:46 Tom Tromey [this message]
2013-10-17 16:58 ` Pedro Alves
2013-10-29 16:41 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382024768-24151-1-git-send-email-tromey@redhat.com \
--to=tromey@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox