1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
From 090a17ca338a9311d682ecc5933b32bff67cf07f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 27 Jul 2019 14:20:14 -0700
Subject: [PATCH] Remove including sys/sysctl.h on glibc based systems
Glibc 2.30 has added deprecation notice and collectd detects it as warning [1]
Fixes
sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings]
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990
Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/3234]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/contextswitch.c | 2 +-
src/memory.c | 2 +-
src/swap.c | 2 +-
src/uuid.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- a/src/contextswitch.c
+++ b/src/contextswitch.c
@@ -26,7 +26,7 @@
#include "common.h"
#include "plugin.h"
-#ifdef HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
--- a/src/memory.c
+++ b/src/memory.c
@@ -28,7 +28,7 @@
#include "common.h"
#include "plugin.h"
-#ifdef HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
#ifdef HAVE_SYS_VMMETER_H
--- a/src/swap.c
+++ b/src/swap.c
@@ -49,7 +49,7 @@
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#if HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
#if HAVE_SYS_DKSTAT_H
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -29,7 +29,7 @@
#include "common.h"
#include "plugin.h"
-#if HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -60,7 +60,7 @@
#if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) || \
(defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME)
-#ifdef HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
--- a/src/processes.c
+++ b/src/processes.c
@@ -82,7 +82,7 @@
#if HAVE_MACH_VM_PROT_H
#include <mach/vm_prot.h>
#endif
-#if HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
/* #endif HAVE_THREAD_INFO */
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -33,7 +33,7 @@
*/
/* #endif HAVE_LIBKSTAT */
-#elif HAVE_SYS_SYSCTL_H
+#elif defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
/* Using sysctl interface to retrieve the boot time on *BSD / Darwin / OS X
* systems */
|
