projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
beb4697
)
libcollectdclient: Include headers with the "collectd/" path prefix.
author
Florian Forster
<octo@collectd.org>
Thu, 13 Apr 2017 10:06:20 +0000
(12:06 +0200)
committer
Florian Forster
<octo@collectd.org>
Thu, 13 Apr 2017 10:09:34 +0000
(12:09 +0200)
Makefile.am
patch
|
blob
|
history
src/collectd-nagios.c
patch
|
blob
|
history
src/collectd-tg.c
patch
|
blob
|
history
src/collectdctl.c
patch
|
blob
|
history
src/libcollectdclient/collectd/client.h
patch
|
blob
|
history
src/libcollectdclient/collectd/network.h
patch
|
blob
|
history
src/libcollectdclient/collectd/network_buffer.h
patch
|
blob
|
history
src/libcollectdclient/collectd/types.h
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
c033472
..
f8d911d
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-244,8
+244,8
@@
collectdmon_SOURCES = src/collectdmon.c
collectd_nagios_SOURCES = src/collectd-nagios.c
collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) \
collectd_nagios_SOURCES = src/collectd-nagios.c
collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) \
- -I$(srcdir)/src/libcollectdclient
/collectd
\
- -I$(top_builddir)/src/libcollectdclient
/collectd
+ -I$(srcdir)/src/libcollectdclient \
+ -I$(top_builddir)/src/libcollectdclient
collectd_nagios_LDADD = libcollectdclient.la
if BUILD_WITH_LIBSOCKET
collectd_nagios_LDADD += -lsocket
collectd_nagios_LDADD = libcollectdclient.la
if BUILD_WITH_LIBSOCKET
collectd_nagios_LDADD += -lsocket
@@
-257,8
+257,8
@@
endif
collectdctl_SOURCES = src/collectdctl.c
collectdctl_CPPFLAGS = $(AM_CPPFLAGS) \
collectdctl_SOURCES = src/collectdctl.c
collectdctl_CPPFLAGS = $(AM_CPPFLAGS) \
- -I$(srcdir)/src/libcollectdclient
/collectd
\
- -I$(top_builddir)/src/libcollectdclient
/collectd
+ -I$(srcdir)/src/libcollectdclient \
+ -I$(top_builddir)/src/libcollectdclient
collectdctl_LDADD = libcollectdclient.la
if BUILD_WITH_LIBSOCKET
collectdctl_LDADD += -lsocket
collectdctl_LDADD = libcollectdclient.la
if BUILD_WITH_LIBSOCKET
collectdctl_LDADD += -lsocket
@@
-270,8
+270,8
@@
endif
collectd_tg_SOURCES = src/collectd-tg.c
collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \
collectd_tg_SOURCES = src/collectd-tg.c
collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \
- -I$(srcdir)/src/libcollectdclient
/collectd
\
- -I$(top_builddir)/src/libcollectdclient
/collectd
+ -I$(srcdir)/src/libcollectdclient \
+ -I$(top_builddir)/src/libcollectdclient
collectd_tg_LDADD = \
$(PTHREAD_LIBS) \
libheap.la \
collectd_tg_LDADD = \
$(PTHREAD_LIBS) \
libheap.la \
@@
-474,8
+474,8
@@
libcollectdclient_la_SOURCES = \
src/libcollectdclient/network_buffer.c
libcollectdclient_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
src/libcollectdclient/network_buffer.c
libcollectdclient_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
- -I$(srcdir)/src/libcollectdclient
/collectd
\
- -I$(top_builddir)/src/libcollectdclient
/collectd
\
+ -I$(srcdir)/src/libcollectdclient \
+ -I$(top_builddir)/src/libcollectdclient \
-I$(srcdir)/src/daemon
libcollectdclient_la_LDFLAGS = -version-info 1:0:0
libcollectdclient_la_LIBADD =
-I$(srcdir)/src/daemon
libcollectdclient_la_LDFLAGS = -version-info 1:0:0
libcollectdclient_la_LIBADD =
diff --git
a/src/collectd-nagios.c
b/src/collectd-nagios.c
index
993541d
..
e106bb8
100644
(file)
--- a/
src/collectd-nagios.c
+++ b/
src/collectd-nagios.c
@@
-71,7
+71,7
@@
#endif
#endif /* NAN_ZERO_ZERO */
#endif
#endif /* NAN_ZERO_ZERO */
-#include "
libcollectdclient/
collectd/client.h"
+#include "collectd/client.h"
#define RET_OKAY 0
#define RET_WARNING 1
#define RET_OKAY 0
#define RET_WARNING 1
diff --git
a/src/collectd-tg.c
b/src/collectd-tg.c
index
3bde325
..
a0fe284
100644
(file)
--- a/
src/collectd-tg.c
+++ b/
src/collectd-tg.c
@@
-44,8
+44,8
@@
#include "utils_heap.h"
#include "utils_heap.h"
-#include "
libcollectdclient/
collectd/client.h"
-#include "
libcollectdclient/
collectd/network.h"
+#include "collectd/client.h"
+#include "collectd/network.h"
#define DEF_NUM_HOSTS 1000
#define DEF_NUM_PLUGINS 20
#define DEF_NUM_HOSTS 1000
#define DEF_NUM_PLUGINS 20
diff --git
a/src/collectdctl.c
b/src/collectdctl.c
index
248baad
..
35e948e
100644
(file)
--- a/
src/collectdctl.c
+++ b/
src/collectdctl.c
@@
-65,7
+65,7
@@
#endif
#endif /* NAN_ZERO_ZERO */
#endif
#endif /* NAN_ZERO_ZERO */
-#include "
libcollectdclient/
collectd/client.h"
+#include "collectd/client.h"
#ifndef PREFIX
#define PREFIX "/opt/" PACKAGE_NAME
#ifndef PREFIX
#define PREFIX "/opt/" PACKAGE_NAME
diff --git
a/src/libcollectdclient/collectd/client.h
b/src/libcollectdclient/collectd/client.h
index
d385e90
..
fd4899f
100644
(file)
--- a/
src/libcollectdclient/collectd/client.h
+++ b/
src/libcollectdclient/collectd/client.h
@@
-27,8
+27,8
@@
#ifndef LIBCOLLECTD_COLLECTDCLIENT_H
#define LIBCOLLECTD_COLLECTDCLIENT_H 1
#ifndef LIBCOLLECTD_COLLECTDCLIENT_H
#define LIBCOLLECTD_COLLECTDCLIENT_H 1
-#include "lcc_features.h"
-#include "types.h"
+#include "
collectd/
lcc_features.h"
+#include "
collectd/
types.h"
/* COLLECTD_TRACE is the environment variable used to control trace output. When
* set to something non-zero, all lines sent to / received from the daemon are
/* COLLECTD_TRACE is the environment variable used to control trace output. When
* set to something non-zero, all lines sent to / received from the daemon are
diff --git
a/src/libcollectdclient/collectd/network.h
b/src/libcollectdclient/collectd/network.h
index
35fd7d6
..
c8a5da5
100644
(file)
--- a/
src/libcollectdclient/collectd/network.h
+++ b/
src/libcollectdclient/collectd/network.h
@@
-27,11
+27,11
@@
#ifndef LIBCOLLECTDCLIENT_NETWORK_H
#define LIBCOLLECTDCLIENT_NETWORK_H 1
#ifndef LIBCOLLECTDCLIENT_NETWORK_H
#define LIBCOLLECTDCLIENT_NETWORK_H 1
+#include "collectd/client.h"
+
#include <inttypes.h>
#include <stdint.h>
#include <inttypes.h>
#include <stdint.h>
-#include "client.h"
-
#define NET_DEFAULT_V4_ADDR "239.192.74.66"
#define NET_DEFAULT_V6_ADDR "ff18::efc0:4a42"
#define NET_DEFAULT_PORT "25826"
#define NET_DEFAULT_V4_ADDR "239.192.74.66"
#define NET_DEFAULT_V6_ADDR "ff18::efc0:4a42"
#define NET_DEFAULT_PORT "25826"
diff --git
a/src/libcollectdclient/collectd/network_buffer.h
b/src/libcollectdclient/collectd/network_buffer.h
index
9f39310
..
58cc3c5
100644
(file)
--- a/
src/libcollectdclient/collectd/network_buffer.h
+++ b/
src/libcollectdclient/collectd/network_buffer.h
@@
-28,8
+28,8
@@
#define LIBCOLLECTDCLIENT_NETWORK_BUFFER_H 1
/* FIXME */
#define LIBCOLLECTDCLIENT_NETWORK_BUFFER_H 1
/* FIXME */
-#include "client.h"
-#include "network.h"
+#include "c
ollectd/c
lient.h"
+#include "
collectd/
network.h"
/* Ethernet frame - (IPv6 header + UDP header) */
#define LCC_NETWORK_BUFFER_SIZE_DEFAULT 1452
/* Ethernet frame - (IPv6 header + UDP header) */
#define LCC_NETWORK_BUFFER_SIZE_DEFAULT 1452
diff --git
a/src/libcollectdclient/collectd/types.h
b/src/libcollectdclient/collectd/types.h
index
d2e3764
..
445fef3
100644
(file)
--- a/
src/libcollectdclient/collectd/types.h
+++ b/
src/libcollectdclient/collectd/types.h
@@
-27,7
+27,7
@@
#ifndef LIBCOLLECTD_COLLECTD_TYPES_H
#define LIBCOLLECTD_COLLECTD_TYPES_H 1
#ifndef LIBCOLLECTD_COLLECTD_TYPES_H
#define LIBCOLLECTD_COLLECTD_TYPES_H 1
-#include "lcc_features.h"
+#include "
collectd/
lcc_features.h"
#include <stdint.h> /* for uint64_t */
#include <sys/types.h> /* for size_t */
#include <stdint.h> /* for uint64_t */
#include <sys/types.h> /* for size_t */