cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-07 11:20:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not use sysctl.h on linux (it had been deprecated)

Browse Source 
It had been deprecated for a long time (AFAIK), but since
glibc-2.29.9000-309-g744e829637 it produces a #warning

(cherry picked from commit b9b9f19058dc04b7ad4d079a38f6b86c0e7b1072)
This commit is contained in:
Azat Khuzhin 2019-10-16 01:11:51 +03:00
parent e35e02e680
commit d2871a37bf
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -434,7 +434,9 @@ CHECK_INCLUDE_FILE(mach/mach_time.h EVENT__HAVE_MACH_MACH_TIME_H)
CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H) CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H)
CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H) CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H)
CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H) CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H)
CHECK_INCLUDE_FILE(sys/sysctl.h EVENT__HAVE_SYS_SYSCTL_H) if (NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
CHECK_INCLUDE_FILE(sys/sysctl.h EVENT__HAVE_SYS_SYSCTL_H)
endif()
CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H) CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H)
CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H) CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H)

14
configure.ac
View File

@ -252,11 +252,15 @@ AC_CHECK_HEADERS([ \
errno.h \ errno.h \
]) ])
AC_CHECK_HEADERS(sys/sysctl.h, [], [], [ case "${host_os}" in
#ifdef HAVE_SYS_PARAM_H linux*) ;;
#include <sys/param.h> *)
#endif AC_CHECK_HEADERS(sys/sysctl.h, [], [], [
]) #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
])
esac
if test "x$ac_cv_header_sys_queue_h" = "xyes"; then if test "x$ac_cv_header_sys_queue_h" = "xyes"; then
AC_MSG_CHECKING(for TAILQ_FOREACH in sys/queue.h) AC_MSG_CHECKING(for TAILQ_FOREACH in sys/queue.h)