projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
daemon
/
collectd.h
diff --git
a/src/daemon/collectd.h
b/src/daemon/collectd.h
index
9002187
..
500bba2
100644
(file)
--- a/
src/daemon/collectd.h
+++ b/
src/daemon/collectd.h
@@
-271,7
+271,7
@@
typedef int _Bool;
#endif
#ifndef COLLECTD_USERAGENT
#endif
#ifndef COLLECTD_USERAGENT
- # define COLLECTD_USERAGENT PACKAGE_NAME
"/"
PACKAGE_VERSION
+ # define COLLECTD_USERAGENT PACKAGE_NAME
"/"
PACKAGE_VERSION
#endif
/* Only enable __attribute__() for compilers known to support it. */
#endif
/* Only enable __attribute__() for compilers known to support it. */
@@
-316,7
+316,6
@@
typedef uint64_t cdtime_t;
extern char hostname_g[];
extern cdtime_t interval_g;
extern char hostname_g[];
extern cdtime_t interval_g;
-extern int pidfile_from_cli;
extern int timeout_g;
#endif /* COLLECTD_H */
extern int timeout_g;
#endif /* COLLECTD_H */