From f0e2ef329dcb366f2beb2ccdca1a49bc5ce33444 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 17 Sep 2002 12:24:33 +0000 Subject: [PATCH] workaround for bug in OpenBSD headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 24 +++++++++++++++++++----- src/gtk1/app.cpp | 24 +++++++++++++++++++----- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 20d8961d6c..61b722b708 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -44,13 +44,27 @@ #endif #include + +// TODO: use configure test to detect which of select()/poll() is available! #if defined(__DARWIN__) -# warning "FIXME: select must be used instead of poll (GD)" + #warning "FIXME: select must be used instead of poll (GD)" #elif defined(__VMS) -# include + #include #else -# include -#endif + // bug in the OpenBSD headers: at least in 3.1 there is no extern "C" in + // neither poll.h nor sys/poll.h which results in link errors later + #ifdef __OPENBSD__ + extern "C" + { + #endif + + #include + + #ifdef __OPENBSD__ + }; + #endif +#endif // platform + #include "wx/gtk/win_gtk.h" #include @@ -545,7 +559,7 @@ bool wxApp::SendIdleEvents( wxWindow* win ) event.SetEventObject(win); win->GetEventHandler()->ProcessEvent(event); - + if (event.MoreRequested()) needMore = TRUE; diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 20d8961d6c..61b722b708 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -44,13 +44,27 @@ #endif #include + +// TODO: use configure test to detect which of select()/poll() is available! #if defined(__DARWIN__) -# warning "FIXME: select must be used instead of poll (GD)" + #warning "FIXME: select must be used instead of poll (GD)" #elif defined(__VMS) -# include + #include #else -# include -#endif + // bug in the OpenBSD headers: at least in 3.1 there is no extern "C" in + // neither poll.h nor sys/poll.h which results in link errors later + #ifdef __OPENBSD__ + extern "C" + { + #endif + + #include + + #ifdef __OPENBSD__ + }; + #endif +#endif // platform + #include "wx/gtk/win_gtk.h" #include @@ -545,7 +559,7 @@ bool wxApp::SendIdleEvents( wxWindow* win ) event.SetEventObject(win); win->GetEventHandler()->ProcessEvent(event); - + if (event.MoreRequested()) needMore = TRUE;