luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-21 08:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use POSIX-specified <poll.h> over <sys/poll.h>

Browse Source 
POSIX specifies that <poll.h> is the correct header to include for
poll(), so let's do that instead.

https://bugzilla.gnome.org/show_bug.cgi?id=141251
This commit is contained in:
Ryan Lortie
2013-12-22 11:33:07 -05:00
parent eeac91f866
commit 3f41e49285
6 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.win32.in
View File

@@ -584,9 +584,6 @@
/* #undef HAVE_SYS_PARAM_H */ /* #undef HAVE_SYS_PARAM_H */
#endif /* _MSC_VER or __DMC__ */ #endif /* _MSC_VER or __DMC__ */
/* Define to 1 if you have the <sys/poll.h> header file. */
/* #undef HAVE_SYS_POLL_H */
/* Define to 1 if you have the <sys/prctl.h> header file. */ /* Define to 1 if you have the <sys/prctl.h> header file. */
/* #undef HAVE_SYS_PRCTL_H */ /* #undef HAVE_SYS_PRCTL_H */

16
configure.ac
View File

@@ -771,7 +771,7 @@ fi
# check for header files # check for header files
AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h]) AC_CHECK_HEADERS([sys/param.h sys/resource.h])
AC_CHECK_HEADERS([sys/select.h stdint.h inttypes.h sched.h malloc.h]) AC_CHECK_HEADERS([sys/select.h stdint.h inttypes.h sched.h malloc.h])
AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h]) AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h]) AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
@@ -2429,11 +2429,11 @@ dnl ****************************************
glib_poll_includes=[" glib_poll_includes=["
#include <sys/types.h> #include <sys/types.h>
#include <sys/poll.h> #include <poll.h>
"] "]
AS_IF([ test $ac_cv_header_sys_types_h = yes && AS_IF([ test $ac_cv_header_sys_types_h = yes &&
test $ac_cv_header_sys_poll_h = yes ], [ test $ac_cv_func_poll = yes ], [
glib_failed=false glib_failed=false
GLIB_CHECK_VALUE(POLLIN, $glib_poll_includes, glib_failed=true) GLIB_CHECK_VALUE(POLLIN, $glib_poll_includes, glib_failed=true)
GLIB_CHECK_VALUE(POLLOUT, $glib_poll_includes, glib_failed=true) GLIB_CHECK_VALUE(POLLOUT, $glib_poll_includes, glib_failed=true)
@@ -2458,9 +2458,6 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <poll.h> #include <poll.h>
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
int main(void) { int main(void) {
struct pollfd fds[1]; struct pollfd fds[1];
int fd; int fd;
@@ -2803,9 +2800,6 @@ _______EOF
if test "$glib_header_alloca_h" = "yes"; then if test "$glib_header_alloca_h" = "yes"; then
echo '#define GLIB_HAVE_ALLOCA_H' >> $outfile echo '#define GLIB_HAVE_ALLOCA_H' >> $outfile
fi fi
if test x$glib_sys_poll_h = xyes; then
echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
fi
if test x$glib_included_printf != xyes; then if test x$glib_included_printf != xyes; then
echo " echo "
/* Specifies that GLib's g_print*() functions wrap the /* Specifies that GLib's g_print*() functions wrap the
@@ -3124,10 +3118,6 @@ else
glib_header_alloca_h="$ac_cv_header_alloca_h" glib_header_alloca_h="$ac_cv_header_alloca_h"
fi fi
if test x$ac_cv_header_sys_poll_h = xyes ; then
glib_sys_poll_h=yes
fi
if test x$enable_included_printf = xyes ; then if test x$enable_included_printf = xyes ; then
glib_included_printf=yes glib_included_printf=yes
fi fi

1
docs/reference/glib/glib-sections.txt
View File

@@ -544,7 +544,6 @@ g_source_remove_by_funcs_user_data
g_source_remove_by_user_data g_source_remove_by_user_data
<SUBSECTION Private> <SUBSECTION Private>
GLIB_HAVE_SYS_POLL_H
GLIB_HAVE_ALLOCA_H GLIB_HAVE_ALLOCA_H
alloca alloca
GLIB_USING_SYSTEM_PRINTF GLIB_USING_SYSTEM_PRINTF

5
gio/gunixmounts.c
View File

@@ -31,11 +31,8 @@
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#endif #endif
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif #endif
#endif #ifdef HAVE_POLL
#ifdef HAVE_POLL_H
#include <poll.h> #include <poll.h>
#endif #endif
#include <stdio.h> #include <stdio.h>

4
glib/gpoll.c
View File

@@ -55,8 +55,8 @@
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif /* HAVE_SYS_TIME_H */ #endif /* HAVE_SYS_TIME_H */
#ifdef GLIB_HAVE_SYS_POLL_H #ifdef HAVE_POLL
# include <sys/poll.h> # include <poll.h>
/* The poll() emulation on OS/X doesn't handle fds=NULL, nfds=0, /* The poll() emulation on OS/X doesn't handle fds=NULL, nfds=0,
* so we prefer our own poll emulation. * so we prefer our own poll emulation.

2
tests/timeloop-basic.c
View File

@@ -8,7 +8,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/poll.h> #include <poll.h>
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0