From 493e7ca45f2cc2cd5741222ac533f691300ddf6e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 19 Dec 2006 15:28:17 +0000 Subject: [PATCH] Fix the broken poll test. (#387260, Christian Persch) 2006-12-18 Matthias Clasen * configure.in: Fix the broken poll test. (#387260, Christian Persch) --- ChangeLog | 3 +++ configure.in | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ac4eaff8..a8d29f047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-12-18 Matthias Clasen + * configure.in: Fix the broken poll test. (#387260, + Christian Persch) + * glib/gmain.c (child_watch_helper_thread): Readd a return which was removed as dead code a while ago. icc may consider it dead, but gcc doesn't like non-void diff --git a/configure.in b/configure.in index e4b9189ab..9833a45ad 100644 --- a/configure.in +++ b/configure.in @@ -2121,13 +2121,14 @@ else glib_cv_value_POLLNVAL=32 fi -# Check for Mac OS X's broken poll -if test $cross_compiling != yes ; then - AC_MSG_CHECKING(for broken poll) - AC_TRY_RUN([[ +AC_MSG_CHECKING([for broken poll]) +AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include #include + #ifdef HAVE_SYS_POLL_H + #include + #endif int main(void) { struct pollfd fds[1]; int fd; @@ -2139,13 +2140,12 @@ if test $cross_compiling != yes ; then exit(1); /* Does not work for devices -- fail */ } exit(0); - }]], - broken_poll=no, - broken_poll=yes - AC_DEFINE(BROKEN_POLL,1,[poll doesn't work on devices]) - ) - AC_MSG_RESULT($broken_poll) -fi + }]])], + [broken_poll=no], + [broken_poll=yes + AC_DEFINE(BROKEN_POLL,1,[poll doesn't work on devices])], + [broken_poll="no (cross compiling)"]) +AC_MSG_RESULT($broken_poll) dnl ********************** dnl *** Win32 API libs ***