From: Michał Kępień <michal@isc.org>
Date: Wed, 6 Nov 2019 14:31:47 +0000 (+0100)
Subject: Do not use <sys/sysctl.h> on Linux
X-Git-Tag: v9.15.6~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65a8b53bd06bff2debf1e58ed3168ad89e69c0fa;p=thirdparty%2Fbind9.git

Do not use <sys/sysctl.h> on Linux

glibc 2.30 deprecated the <sys/sysctl.h> header [1].  However, that
header is still used on other Unix-like systems, so only prevent it from
being used on Linux, in order to prevent compiler warnings from being
triggered.

[1] https://sourceware.org/ml/libc-alpha/2019-08/msg00029.html
---

diff --git a/lib/isc/unix/meminfo.c b/lib/isc/unix/meminfo.c
index 7ac6453e9eb..9fb5b9f3a34 100644
--- a/lib/isc/unix/meminfo.c
+++ b/lib/isc/unix/meminfo.c
@@ -12,7 +12,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
 
diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index d128de8f7c1..c2573bd381b 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #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
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 0aec5607604..7b7c8fc2bab 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -18,7 +18,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>