From c001dc2d9c55c415d671aa93386784db798dcf73 Mon Sep 17 00:00:00 2001
From: Pierre Moreau <pierremoreau@users.noreply.github.com>
Date: Thu, 27 Aug 2020 19:31:51 +0200
Subject: [PATCH] Only include sys/sysctl.h on for Apple (#916)

glibc deprecated that header in version 2.30, and removed it in 2.32.
---
 test_common/harness/testHarness.cpp               | 2 +-
 test_conformance/conversions/test_conversions.cpp | 2 +-
 test_conformance/half/main.cpp                    | 2 +-
 test_conformance/printf/test_printf.cpp           | 2 +-
 test_conformance/select/test_select.cpp           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp
index a4432fa6..718983a7 100644
--- a/test_common/harness/testHarness.cpp
+++ b/test_common/harness/testHarness.cpp
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #endif
 
-#if !defined(_WIN32) && !defined(__ANDROID__)
+#if defined(__APPLE__)
 #include <sys/sysctl.h>
 #endif
 
diff --git a/test_conformance/conversions/test_conversions.cpp b/test_conformance/conversions/test_conversions.cpp
index db5491fd..2af85558 100644
--- a/test_conformance/conversions/test_conversions.cpp
+++ b/test_conformance/conversions/test_conversions.cpp
@@ -19,7 +19,7 @@
 #include "harness/testHarness.h"
 #include "harness/kernelHelpers.h"
 #include "harness/parseParameters.h"
-#if !defined(_WIN32) && !defined(__ANDROID__)
+#if defined(__APPLE__)
 #include <sys/sysctl.h>
 #endif
 
diff --git a/test_conformance/half/main.cpp b/test_conformance/half/main.cpp
index 1af138ca..6600cc58 100644
--- a/test_conformance/half/main.cpp
+++ b/test_conformance/half/main.cpp
@@ -19,7 +19,7 @@
 
 #if !defined (_WIN32)
 #include <sys/resource.h>
-#if !defined(__ANDROID__)
+#if defined(__APPLE__)
 #include <sys/sysctl.h>
 #endif
 #include <libgen.h>
diff --git a/test_conformance/printf/test_printf.cpp b/test_conformance/printf/test_printf.cpp
index 075a2767..b169e6b9 100644
--- a/test_conformance/printf/test_printf.cpp
+++ b/test_conformance/printf/test_printf.cpp
@@ -20,7 +20,7 @@
 #include <memory>
 
 #if ! defined( _WIN32)
-#if ! defined( __ANDROID__ )
+#if defined(__APPLE__)
 #include <sys/sysctl.h>
 #endif
 #include <unistd.h>
diff --git a/test_conformance/select/test_select.cpp b/test_conformance/select/test_select.cpp
index 031d3ca1..da136b48 100644
--- a/test_conformance/select/test_select.cpp
+++ b/test_conformance/select/test_select.cpp
@@ -20,7 +20,7 @@
 #include <time.h>
 #include <string.h>
 #if ! defined( _WIN32)
-#if ! defined( __ANDROID__ )
+#if defined(__APPLE__)
 #include <sys/sysctl.h>
 #endif
 #endif