Merge branch '1298-do-not-use-sys-sysctl.h-on-linux-v9_11' into 'v9_11'

[v9_11] Do not use <sys/sysctl.h> on Linux See merge request isc-projects/bind9!2546
2019-11-06 20:25:14 +00:00
parent 55786b9755 4876a88fc0
commit 3b92b68d22
3 changed files with 3 additions and 3 deletions
--- a/lib/isc/unix/meminfo.c
+++ b/lib/isc/unix/meminfo.c
@@ -14,7 +14,7 @@
 #include <isc/meminfo.h>
 #include <inttypes.h>
 #include <unistd.h>
-#ifdef HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__linux__)
 #include <sys/sysctl.h>
 #endif

--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -14,7 +14,7 @@

 #include <sys/types.h>

-#if defined(HAVE_SYS_SYSCTL_H)
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__linux__)
 #if defined(HAVE_SYS_PARAM_H)
 #include <sys/param.h>
 #endif
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__linux__)
 #include <sys/sysctl.h>
 #endif
 #include <sys/time.h>