Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always include sys/time.h and sys/select.h from selectdispatcher.h.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-03-20 12:45:28 +00:00
parent ef40c54c63
commit d141826876
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/private/selectdispatcher.h
View File

@@ -15,14 +15,17 @@
#if wxUSE_SELECT_DISPATCHER #if wxUSE_SELECT_DISPATCHER
#if defined(HAVE_SYS_SELECT_H) || defined(__WATCOMC__)
#include <sys/time.h>
#include <sys/select.h>
#endif
#ifdef __WATCOMC__ #ifdef __WATCOMC__
#include <types.h> #include <types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/time.h> #include <tcpustd.h>
#include <sys/select.h>
#include <tcpustd.h>
#else #else
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include "wx/private/fdiodispatcher.h" #include "wx/private/fdiodispatcher.h"

5
src/common/selectdispatcher.cpp
View File

@@ -34,11 +34,6 @@
#include "wx/intl.h" #include "wx/intl.h"
#endif #endif
#if defined(HAVE_SYS_SELECT_H) || defined(__WATCOMC__)
#include <sys/time.h>
#include <sys/select.h>
#endif
#include <errno.h> #include <errno.h>
#define wxSelectDispatcher_Trace wxT("selectdispatcher") #define wxSelectDispatcher_Trace wxT("selectdispatcher")