From: Pádraig Brady <P@draigBrady.com>
Date: Sun, 2 Feb 2020 15:52:59 +0000 (+0000)
Subject: build: avoid including sysctl.h on glibc
X-Git-Tag: v8.32~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c9382801944a1673e3f9871e829cb8f0f30aeb;p=thirdparty%2Fcoreutils.git

build: avoid including sysctl.h on glibc

* src/uname.c: Avoid unneeded header with GLIBC,
which has been deprecated since glibc-2.30.
* src/uptime.c: Likewise.
---

diff --git a/src/uname.c b/src/uname.c
index 63758c2446..4065bf29eb 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -27,7 +27,7 @@
 # include <sys/systeminfo.h>
 #endif
 
-#if HAVE_SYS_SYSCTL_H
+#if HAVE_SYS_SYSCTL_H && ! defined __GLIBC__
 # if HAVE_SYS_PARAM_H
 #  include <sys/param.h> /* needed for OpenBSD 3.0 */
 # endif
diff --git a/src/uptime.c b/src/uptime.c
index 9749ca81a3..a42e702b51 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include "system.h"
 
-#if HAVE_SYSCTL && HAVE_SYS_SYSCTL_H
+#if HAVE_SYSCTL && HAVE_SYS_SYSCTL_H && ! defined __GLIBC__
 # include <sys/sysctl.h>
 #endif
 
@@ -80,7 +80,8 @@ print_uptime (size_t n, const STRUCT_UTMP *this)
     }
 #endif /* HAVE_PROC_UPTIME */
 
-#if HAVE_SYSCTL && defined CTL_KERN && defined KERN_BOOTTIME
+#if HAVE_SYSCTL && ! defined __GLIBC__ \
+    && defined CTL_KERN && defined KERN_BOOTTIME
   {
     /* FreeBSD specific: fetch sysctl "kern.boottime".  */
     static int request[2] = { CTL_KERN, KERN_BOOTTIME };