From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue, 14 Apr 2015 18:42:07 +0000 (+0100)
Subject: windows-nat: Don't use ternary conditional operator in get_windows_debug_event
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=776704b9178cce5741e96555ceca514d84824815;p=binutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 27f7fdf0297..7e25c19a477 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 fd310830869..dea4368729e 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: