From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 19 Dec 2006 15:28:17 +0000 (+0000)
Subject: Fix the broken poll test. (#387260, Christian Persch)
X-Git-Tag: GLIB_2_13_0~150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=493e7ca45f2cc2cd5741222ac533f691300ddf6e;p=platform%2Fupstream%2Fglib.git

Fix the broken poll test. (#387260, Christian Persch)

2006-12-18  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Fix the broken poll test.  (#387260,
        Christian Persch)
---

diff --git a/ChangeLog b/ChangeLog
index 9ac4eaf..a8d29f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-12-18  Matthias Clasen  <mclasen@redhat.com>
 
+	* 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 e4b9189..9833a45 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 <stdlib.h>
 	#include <fcntl.h>
 	#include <poll.h>
+	#ifdef HAVE_SYS_POLL_H
+	#include <sys/poll.h>
+	#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 ***