diff options
| author | Simon McVittie <smcv@collabora.com> | 2020-04-01 14:17:52 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2020-04-01 14:17:52 +0000 |
| commit | 1530582863b801839bc57c9ec8bc9ca3d16f2a65 (patch) | |
| tree | d0b02f70eb34e06e89479c86fd40ae879817c814 /cmake/ConfigureChecks.cmake | |
| parent | 16ce800e99734d8018dc67b3fd3f20d2095d0d7b (diff) | |
| parent | 3509748dce7cb1512d3a071e454505f6b232f0a5 (diff) | |
| download | dbus-1530582863b801839bc57c9ec8bc9ca3d16f2a65.tar.gz | |
Merge branch 'fix-poll-header' into 'master'
sysdeps: use POSIX poll.h instead of sys/poll.h
See merge request dbus/dbus!148
Diffstat (limited to 'cmake/ConfigureChecks.cmake')
| -rw-r--r-- | cmake/ConfigureChecks.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index ac8e0e12..7bc789f0 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -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) |