diff options
| author | Pedro Alves <palves@redhat.com> | 2015-05-15 16:00:42 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-05-15 16:00:42 +0100 |
| commit | 452003ef2ca3e1cf81b17d960b59b8a8c167054b (patch) | |
| tree | 1e85aaf09c40a15f677d455fc586d445864af514 | |
| parent | 52e48b3661a55d5f7cc29591780b844e47157c3f (diff) | |
| download | binutils-gdb-452003ef2ca3e1cf81b17d960b59b8a8c167054b.tar.gz | |
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.
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/target.h | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 1fc24be3554..0f30c66d0ee 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 8d233834cee..e9c6be06e64 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) |