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)
This commit is contained in:
Matthias Clasen 2006-12-19 15:28:17 +00:00 committed by Matthias Clasen
parent 2d7fa2dd18
commit 493e7ca45f
2 changed files with 14 additions and 11 deletions

View File

@ -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

View File

@ -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 ***