diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-03-24 12:04:24 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-03-26 18:17:22 +0100 |
| commit | 3509748dce7cb1512d3a071e454505f6b232f0a5 (patch) | |
| tree | 5ba56e782137f6cf2687495408bf7aea8cfde1db /cmake | |
| parent | 07ba6c0a40a7773fd3f63a13f6aeaa13876c9d19 (diff) | |
| download | dbus-3509748dce7cb1512d3a071e454505f6b232f0a5.tar.gz | |
sysdeps: use POSIX poll.h instead of sys/poll.h
POSIX.1-2001 and POSIX.1-2008 specifies include <poll.h> so use that
rather than the non-standard/legacy include <sys/poll.h>.
This fixes the following warnings when building with musl libc:
1 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
| ^~~~~~~
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 3a1165f0..a2516678 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -32,7 +32,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 @@ -55,6 +54,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) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 2f9f5413..bd1c0dbf 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -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 */ |