diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 6e1c25de26..a1bdce64aa 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -42,7 +42,9 @@ #endif #include -#ifdef __VMS +#if defined(__DARWIN__) +// FIXME: select must be used instead of poll (GD) +#elif defined(__VMS) # include #else # include @@ -245,7 +247,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) wxMutexGuiLeave(); g_mainThreadLocked = TRUE; +#ifdef __DARWIN__ + // FIXME: poll is not available under Darwin/Mac OS X and this needs + // to be implemented using select instead (GD) + // what about other BSD derived systems? + res = -1; +#else res = poll( (struct pollfd*) ufds, nfds, timeout ); +#endif wxMutexGuiEnter(); g_mainThreadLocked = FALSE; diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 6e1c25de26..a1bdce64aa 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -42,7 +42,9 @@ #endif #include -#ifdef __VMS +#if defined(__DARWIN__) +// FIXME: select must be used instead of poll (GD) +#elif defined(__VMS) # include #else # include @@ -245,7 +247,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) wxMutexGuiLeave(); g_mainThreadLocked = TRUE; +#ifdef __DARWIN__ + // FIXME: poll is not available under Darwin/Mac OS X and this needs + // to be implemented using select instead (GD) + // what about other BSD derived systems? + res = -1; +#else res = poll( (struct pollfd*) ufds, nfds, timeout ); +#endif wxMutexGuiEnter(); g_mainThreadLocked = FALSE;