[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] sysctl.h: avoid including on glibc
From: |
Pádraig Brady |
Subject: |
[PATCH] sysctl.h: avoid including on glibc |
Date: |
Sun, 2 Feb 2020 15:29:00 +0000 |
* lib/nproc.c: Avoid including deprecated and unneeded header on GLIBC.
* lib/physmem.c: Likewise.
---
ChangeLog | 6 ++++++
lib/nproc.c | 2 +-
lib/physmem.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 55cd67f6f..1e5f94d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-02 Pádraig Brady <address@hidden>
+
+ sysctl.h: avoid including on glibc
+ * lib/nproc.c: Avoid including deprecated and unneeded header on GLIBC.
+ * lib/physmem.c: Likewise.
+
2020-02-02 Bruno Haible <address@hidden>
list, set, oset, map, omap: Avoid imperative voice in documentation.
diff --git a/lib/nproc.c b/lib/nproc.c
index da510214a..ee446bc44 100644
--- a/lib/nproc.c
+++ b/lib/nproc.c
@@ -46,7 +46,7 @@
# include <sys/param.h>
#endif
-#if HAVE_SYS_SYSCTL_H
+#if HAVE_SYS_SYSCTL_H && ! defined __GLIBC__
# include <sys/sysctl.h>
#endif
diff --git a/lib/physmem.c b/lib/physmem.c
index b8ef16e00..38790d980 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -50,7 +50,7 @@
# include <sys/param.h>
#endif
-#if HAVE_SYS_SYSCTL_H
+#if HAVE_SYS_SYSCTL_H && ! defined __GLIBC__
# include <sys/sysctl.h>
#endif
--
2.24.1
- [PATCH] sysctl.h: avoid including on glibc,
Pádraig Brady <=