fix compilation on FreeBSD; (#4398)
* fix compilation on FreeBSD; fixes #4393 * fix zfs header path * fixed incorrect comma use
Costa Tsaousis committed
Oct 15, 2018 at 23:54 UTC
bdabccf69987f9f1e938459f19d2d343536c568b
5 files changed
+14
-7
CMakeLists.txt
+9
-1
@@ -340,7 +340,15 @@ set(WEB_PLUGIN_FILES
340
web/server/web_client.h
341
web/server/web_server.c
342
web/server/web_server.h
343
- web/server/single/single-threaded.c web/server/single/single-threaded.h web/server/multi/multi-threaded.c web/server/multi/multi-threaded.h web/server/static/static-threaded.c web/server/static/static-threaded.h web/server/web_client_cache.c web/server/web_client_cache.h)
343
+ web/server/single/single-threaded.c
344
+ web/server/single/single-threaded.h
345
+ web/server/multi/multi-threaded.c
346
+ web/server/multi/multi-threaded.h
347
+ web/server/static/static-threaded.c
348
+ web/server/static/static-threaded.h
349
+ web/server/web_client_cache.c
350
+ web/server/web_client_cache.h
351
+ )
352
353
set(API_PLUGIN_FILES
354
web/api/rrd2json.c
collectors/freebsd.plugin/freebsd_kstat_zfs.c
+1
-1
@@ -1,7 +1,7 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
#include "plugin_freebsd.h"
4
-#include "../linux-proc.plugin/zfs_common.h"
4
+#include "collectors/proc.plugin/zfs_common.h"
5
6
extern struct arcstats arcstats;
7
collectors/freebsd.plugin/freebsd_sysctl.c
+3
-3
@@ -2266,7 +2266,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2266
, NULL
2267
, "IPv4 ICMP Packets"
2268
, "packets/s"
2269
- "freebsd.plugin",
2269
+ , "freebsd.plugin"
2270
, "net.inet.icmp.stats"
2271
, 2602
2272
, update_every
@@ -2299,7 +2299,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2299
, NULL
2300
, "IPv4 ICMP Errors"
2301
, "packets/s"
2302
- "freebsd.plugin",
2302
+ , "freebsd.plugin"
2303
, "net.inet.icmp.stats"
2304
, 2603
2305
, update_every
@@ -2335,7 +2335,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2335
, NULL
2336
, "IPv4 ICMP Messages"
2337
, "packets/s"
2338
- "freebsd.plugin",
2338
+ , "freebsd.plugin"
2339
, "net.inet.icmp.stats"
2340
, 2604
2341
, update_every
collectors/freebsd.plugin/plugin_freebsd.h
+1
-1
@@ -3,7 +3,7 @@
3
#ifndef NETDATA_PLUGIN_FREEBSD_H
4
#define NETDATA_PLUGIN_FREEBSD_H 1
5
6
-#include "../../daemon/common.h"
6
+#include "daemon/common.h"
7
8
#if (TARGET_OS == OS_FREEBSD)
9
web/server/web_client_cache.h
-1
@@ -20,7 +20,6 @@ struct clients_cache {
20
21
extern __thread struct clients_cache web_clients_cache;
22
23
-extern void web_client_release(struct web_client *w);
23
extern void web_client_release(struct web_client *w);
24
extern struct web_client *web_client_get_from_cache_or_allocate();
25
extern void web_client_cache_destroy(void);