Commit 15305828 authored by Simon McVittie's avatar Simon McVittie

Merge branch 'fix-poll-header' into 'master'

sysdeps: use POSIX poll.h instead of sys/poll.h

See merge request dbus/dbus!148
parents 16ce800e 3509748d
......@@ -33,7 +33,6 @@ check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H)
check_include_file(sys/stat.h HAVE_SYS_STAT_H)
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
check_include_file(sys/uio.h HAVE_SYS_UIO_H)
check_include_file(sys/poll.h HAVE_POLL) # dbus-sysdeps.c, dbus-sysdeps-win.c
check_include_file(sys/prctl.h HAVE_SYS_PRCTL_H)
check_include_file(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) # dbus-sysdeps-unix.c
check_include_file(sys/time.h HAVE_SYS_TIME_H)# dbus-sysdeps-win.c
......@@ -56,6 +55,7 @@ check_symbol_exists(setrlimit "sys/resource.h" HAVE_SETRLIMIT) #
check_symbol_exists(socketpair "sys/socket.h" HAVE_SOCKETPAIR) # dbus-sysdeps.c
check_symbol_exists(setlocale "locale.h" HAVE_SETLOCALE) # dbus-test-main.c
check_symbol_exists(localeconv "locale.h" HAVE_LOCALECONV) # dbus-sysdeps.c
check_symbol_exists(poll "poll.h" HAVE_POLL) # dbus-sysdeps-unix.c
check_symbol_exists(strtoll "stdlib.h" HAVE_STRTOLL) # dbus-send.c
check_symbol_exists(strtoull "stdlib.h" HAVE_STRTOULL) # dbus-send.c
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
......
......@@ -115,7 +115,7 @@
#cmakedefine HAVE_MEMORY_H 1
/* Define to 1 if you have sys/poll.h */
/* Define to 1 if you have poll */
#cmakedefine HAVE_POLL 1
/* Define to 1 if you have signal.h */
......
......@@ -68,9 +68,6 @@
#ifdef HAVE_WRITEV
#include <sys/uio.h>
#endif
#ifdef HAVE_POLL
#include <sys/poll.h>
#endif
#ifdef HAVE_BACKTRACE
#include <execinfo.h>
#endif
......
......@@ -74,12 +74,15 @@
# define BROKEN_POLL
#endif
/* AIX sys/poll.h does #define events reqevents, and other
* wonderousness, so must include sys/poll before declaring
* DBusPollFD
*/
/* Normally we'd only include this in dbus-sysdeps-unix.c.
* However, the member names in DBusPollFD are (deliberately) the same as
* in POSIX struct pollfd, and AIX's poll() implementation is known to
* do things like "#define events reqevents", which would break that approach.
* Defend against that by ensuring that if it's renamed anywhere, it's renamed
* everywhere.
*/
#ifdef HAVE_POLL
#include <sys/poll.h>
#include <poll.h>
#endif
#ifdef DBUS_WINCE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment