sys/sysctl.h has been deprecated

search for and primarily use linux/sysctl.h additionally to sys/sysctl.h

diff --git a/configure.ac b/configure.ac
index a7aae247800b2aa7ff930efa7338f2921439c746..e2c42da3bcc3a5a2fe7aa9e94b2aeb2166d8fd28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,7 @@ AC_CHECK_HEADERS_ONCE([fnmatch.h])
 AC_CHECK_HEADERS_ONCE([inttypes.h])
 AC_CHECK_HEADERS_ONCE([libintl.h])
 AC_CHECK_HEADERS_ONCE([limits.h])
+AC_CHECK_HEADERS_ONCE([linux/sysctl.h])
 AC_CHECK_HEADERS_ONCE([mach/mach.h])
 AC_CHECK_HEADERS_ONCE([malloc.h])
 AC_CHECK_HEADERS_ONCE([math.h])

diff --git a/libtest/cpu.cc b/libtest/cpu.cc
index 0ee8df600ff148c6a868913240fdc59fe2aae46f..c62d6c25e0fc6ddb052cfd0310433682dc421d56 100644 (file)
--- a/libtest/cpu.cc
+++ b/libtest/cpu.cc
@@ -41,7 +41,9 @@
 
 #pragma GCC diagnostic ignored "-Wundef"
 
-#if defined(HAVE_SYS_SYSCTL_H) && HAVE_SYS_SYSCTL_H
+#if defined(HAVE_LINUX_SYSCTL_H) && HAVE_LINUX_SYSCTL_H
+#include <linux/sysctl.h>
+#elif defined(HAVE_SYS_SYSCTL_H) && HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
 #endif