projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectd-java(5): Fix a typo.
[collectd.git]
/
src
/
collectd.h
diff --git
a/src/collectd.h
b/src/collectd.h
index
eece420
..
277a610
100644
(file)
--- a/
src/collectd.h
+++ b/
src/collectd.h
@@
-56,6
+56,9
@@
#if HAVE_STDINT_H
# include <stdint.h>
#endif
#if HAVE_STDINT_H
# include <stdint.h>
#endif
+#if HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
@@
-236,6
+239,10
@@
#define PLUGINDIR PREFIX "/lib/" PACKAGE_NAME
#endif
#define PLUGINDIR PREFIX "/lib/" PACKAGE_NAME
#endif
+#ifndef PKGDATADIR
+#define PKGDATADIR PREFIX "/share/" PACKAGE_NAME
+#endif
+
#ifndef COLLECTD_GRP_NAME
# define COLLECTD_GRP_NAME "collectd"
#endif
#ifndef COLLECTD_GRP_NAME
# define COLLECTD_GRP_NAME "collectd"
#endif
@@
-247,7
+254,10
@@
# define __attribute__(x) /**/
#endif
# define __attribute__(x) /**/
#endif
-#if __GNUC__
+#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+# undef strcpy
+# undef strcat
+# undef strtok
# pragma GCC poison strcpy strcat strtok
#endif
# pragma GCC poison strcpy strcat strtok
#endif
@@
-258,7
+268,8
@@
* included.
*/
#ifndef DONT_POISON_SPRINTF_YET
* included.
*/
#ifndef DONT_POISON_SPRINTF_YET
-# if __GNUC__
+# if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+# undef sprintf
# pragma GCC poison sprintf
# endif
#endif
# pragma GCC poison sprintf
# endif
#endif