| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From a763610719e7d7f6cdc45569b6fbfdb91bb7c87b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 27 Jul 2019 14:30:08 -0700 |
| 4 | Subject: [PATCH] Do not include syscrtl.h with glibc |
| 5 | |
| 6 | glibc 2.30 has deprecated it see [1] |
| 7 | Fixes |
| 8 | sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings] |
| 9 | |
| 10 | [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | src/helper/options.c | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/src/helper/options.c b/src/helper/options.c |
| 19 | index 12755e010..4007e37f6 100644 |
| 20 | --- a/src/helper/options.c |
| 21 | +++ b/src/helper/options.c |
| 22 | @@ -34,7 +34,7 @@ |
| 23 | #if IS_DARWIN |
| 24 | #include <libproc.h> |
| 25 | #endif |
| 26 | -#ifdef HAVE_SYS_SYSCTL_H |
| 27 | +#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) |
| 28 | #include <sys/sysctl.h> |
| 29 | #endif |
| 30 | #if IS_WIN32 && !IS_CYGWIN |
| 31 | -- |
| 32 | 2.22.0 |
| 33 | |