X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.h;h=3d8998fddbeab2f14f21cc0c6e98aef9bb4ad036;hb=5395a6d43d4cc4a654d64d5bf2b298e7c99401e3;hp=eece4203894b1a51786446b6787fba77f152d944;hpb=e3a720229e831073dc22fb1bc5a63530647bcf9c;p=collectd.git diff --git a/src/collectd.h b/src/collectd.h index eece4203..3d8998fd 100644 --- a/src/collectd.h +++ b/src/collectd.h @@ -56,6 +56,21 @@ #if HAVE_STDINT_H # include #endif +#if HAVE_STDBOOL_H +# include +#else +# ifndef HAVE__BOOL +# ifdef __cplusplus +typedef bool _Bool; +# else +# define _Bool signed char +# endif +# endif +# define bool _Bool +# define false 0 +# define true 1 +# define __bool_true_false_are_defined 1 +#endif #if HAVE_UNISTD_H # include #endif @@ -136,6 +151,8 @@ # define BYTE_ORDER _BYTE_ORDER # elif defined(__BYTE_ORDER) # define BYTE_ORDER __BYTE_ORDER +# elif defined(__DARWIN_BYTE_ORDER) +# define BYTE_ORDER __DARWIN_BYTE_ORDER # endif #endif #ifndef BIG_ENDIAN @@ -143,6 +160,8 @@ # define BIG_ENDIAN _BIG_ENDIAN # elif defined(__BIG_ENDIAN) # define BIG_ENDIAN __BIG_ENDIAN +# elif defined(__DARWIN_BIG_ENDIAN) +# define BIG_ENDIAN __DARWIN_BIG_ENDIAN # endif #endif #ifndef LITTLE_ENDIAN @@ -150,6 +169,8 @@ # define LITTLE_ENDIAN _LITTLE_ENDIAN # elif defined(__LITTLE_ENDIAN) # define LITTLE_ENDIAN __LITTLE_ENDIAN +# elif defined(__DARWIN_LITTLE_ENDIAN) +# define LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN # endif #endif #ifndef BYTE_ORDER @@ -236,6 +257,10 @@ #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 @@ -247,7 +272,10 @@ # 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 @@ -258,7 +286,8 @@ * 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