This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] More C++ build fixing
- From: Pedro Alves <palves at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 15 May 2015 15:03:18 -0000
- Subject: [binutils-gdb] More C++ build fixing
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=452003ef2ca3e1cf81b17d960b59b8a8c167054b
commit 452003ef2ca3e1cf81b17d960b59b8a8c167054b
Author: Pedro Alves <palves@redhat.com>
Date: Fri May 15 16:00:42 2015 +0100
More C++ build fixing
Fixes:
In file included from ../../../binutils-gdb/gdb/gdbserver/server.h:61:0,
from ../../../binutils-gdb/gdb/gdbserver/server.c:19:
../../../binutils-gdb/gdb/gdbserver/target.h:442:50: error: second operand to the conditional operator is of type 'void', but the third operand is neither a throw-expression nor of type 'void'
(*the_target->handle_new_gdb_connection) () : 0)
^
Reported by Yuanhui Zhang.
gdb/gdbserver/ChangeLog:
2015-05-15 Pedro Alves <palves@redhat.com>
* target.h (target_handle_new_gdb_connection): Rewrite using if
wrapped in do/while.
Diff:
---
gdb/gdbserver/ChangeLog | 5 +++++
gdb/gdbserver/target.h | 9 ++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 1fc24be..0f30c66 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-15 Pedro Alves <palves@redhat.com>
+
+ * target.h (target_handle_new_gdb_connection): Rewrite using if
+ wrapped in do/while.
+
2015-05-14 Joel Brobecker <brobecker@adacore.com>
* configure.ac: Add prfpregset_t BFD_HAVE_SYS_PROCFS_TYPE check.
diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
index 8d23383..e9c6be0 100644
--- a/gdb/gdbserver/target.h
+++ b/gdb/gdbserver/target.h
@@ -437,9 +437,12 @@ int kill_inferior (int);
(the_target->supports_vfork_events ? \
(*the_target->supports_vfork_events) () : 0)
-#define target_handle_new_gdb_connection() \
- (the_target->handle_new_gdb_connection ? \
- (*the_target->handle_new_gdb_connection) () : 0)
+#define target_handle_new_gdb_connection() \
+ do \
+ { \
+ if (the_target->handle_new_gdb_connection != NULL) \
+ (*the_target->handle_new_gdb_connection) (); \
+ } while (0)
#define detach_inferior(pid) \
(*the_target->detach) (pid)