aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2015-04-14 19:42:07 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2015-04-22 18:30:52 +0100
commit776704b9178cce5741e96555ceca514d84824815 (patch)
tree68c5dbeed667a7ecaa6bc029a28e19b731bbc53d
parent0e5fabeb2c4b90857403995e14550210fe1cae71 (diff)
downloadgdb-776704b9178cce5741e96555ceca514d84824815.zip
gdb-776704b9178cce5741e96555ceca514d84824815.tar.gz
gdb-776704b9178cce5741e96555ceca514d84824815.tar.bz2
windows-nat: Don't use ternary conditional operator in get_windows_debug_event
gdb/ChangeLog: 2015-04-16 Jon Turney <jon.turney@dronecode.org.uk> * windows-nat.c (get_windows_debug_event): Don't use ternary conditional operator.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/windows-nat.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 27f7fdf..7e25c19 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-16 Jon Turney <jon.turney@dronecode.org.uk>
+
+ * windows-nat.c (get_windows_debug_event): Don't use ternary
+ conditional operator.
+
2015-04-21 Pierre Muller <muller@sourceware.org>
PR pascal/17815
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index fd31083..dea4368 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1502,7 +1502,9 @@ get_windows_debug_event (struct target_ops *ops,
{
inferior_ptid = ptid_build (current_event.dwProcessId, 0,
retval);
- current_thread = th ?: thread_rec (current_event.dwThreadId, TRUE);
+ current_thread = th;
+ if (!current_thread)
+ current_thread = thread_rec (current_event.dwThreadId, TRUE);
}
out: