From 65a8b53bd06bff2debf1e58ed3168ad89e69c0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 6 Nov 2019 15:31:47 +0100
Subject: [PATCH] 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
---
 lib/isc/unix/meminfo.c | 2 +-
 lib/isc/unix/net.c     | 2 +-
 lib/isc/unix/socket.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/isc/unix/meminfo.c b/lib/isc/unix/meminfo.c
index 7ac6453e9e..9fb5b9f3a3 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 d128de8f7c..c2573bd381 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 0aec560760..7b7c8fc2ba 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>