1 files changed, 2 insertions, 3 deletions
diff --git a/winsup/cygwin/wait.cc b/winsup/cygwin/wait.cc
index 789a7f309..fda951ead 100644
--- a/winsup/cygwin/wait.cc
+++ b/winsup/cygwin/wait.cc
@@ -47,8 +47,8 @@ extern "C" pid_t
 wait4 (int intpid, int *status, int options, struct rusage *r)
 {
   int res;
-  waitq *w;
   HANDLE waitfor;
+  waitq *w;
 
   pthread_testcancel ();
 
@@ -65,8 +65,7 @@ wait4 (int intpid, int *status, int options, struct rusage *r)
       if (r)
 	memset (r, 0, sizeof (*r));
 
-      if ((w = (waitq *) waitq_storage.get ()) == NULL)
-	w = (waitq *) waitq_storage.create ();
+      w = &_my_tls.wq;
 
       w->pid = intpid;
       w->options = options;