From d141826876edc1e7dd5bf18d050cea8754a3f718 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Mar 2010 12:45:28 +0000
Subject: [PATCH] Always include sys/time.h and sys/select.h from
 selectdispatcher.h.

fd_set used by this header is supposed to be defined in sys/select.h and not
including this header resulted in compilation problems under QNX. And
including sys/time.h shouldn't hurt and is needed by select() under many
systems anyhow.

See #11817.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/private/selectdispatcher.h | 15 +++++++++------
 src/common/selectdispatcher.cpp       |  5 -----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h
index 1dc1ed290f..5c17fe650e 100644
--- a/include/wx/private/selectdispatcher.h
+++ b/include/wx/private/selectdispatcher.h
@@ -15,14 +15,17 @@
 
 #if wxUSE_SELECT_DISPATCHER
 
+#if defined(HAVE_SYS_SELECT_H) || defined(__WATCOMC__)
+    #include <sys/time.h>
+    #include <sys/select.h>
+#endif
+
 #ifdef __WATCOMC__
-  #include <types.h>
-  #include <sys/ioctl.h>
-  #include <sys/time.h>
-  #include <sys/select.h>
-  #include <tcpustd.h>
+    #include <types.h>
+    #include <sys/ioctl.h>
+    #include <tcpustd.h>
 #else
-  #include <sys/types.h>
+    #include <sys/types.h>
 #endif
 
 #include "wx/private/fdiodispatcher.h"
diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index 579de5c887..dca9adec85 100644
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -34,11 +34,6 @@
     #include "wx/intl.h"
 #endif
 
-#if defined(HAVE_SYS_SELECT_H) || defined(__WATCOMC__)
-    #include <sys/time.h>
-    #include <sys/select.h>
-#endif
-
 #include <errno.h>
 
 #define wxSelectDispatcher_Trace wxT("selectdispatcher")
-- 
2.45.2