X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.h;h=24e5add3c4ceeb807668851c88900c9e002505b2;hb=86278412535aeeb0e8e2c50df9029f1b0920e4d8;hp=0df763ec397d9340ea020f444bbc44cea32c1478;hpb=a4d48134385bf44e033bfbcc397fb03572617d4e;p=collectd.git diff --git a/src/collectd.h b/src/collectd.h index 0df763ec..24e5add3 100644 --- a/src/collectd.h +++ b/src/collectd.h @@ -139,6 +139,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 @@ -146,6 +148,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 @@ -153,6 +157,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 @@ -203,9 +209,6 @@ # include #endif -#if HAVE_PTH_H -# include -#endif #if HAVE_SENSORS_SENSORS_H # include #endif @@ -242,6 +245,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 @@ -253,6 +260,22 @@ # define __attribute__(x) /**/ #endif +#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__ +# pragma GCC poison strcpy strcat strtok +#endif + +/* + * Special hack for the perl plugin: Because the later included perl.h defines + * a macro which is never used, but contains `sprintf', we cannot poison that + * identifies just yet. The parl plugin will do that itself once perl.h is + * included. + */ +#ifndef DONT_POISON_SPRINTF_YET +# if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__ +# pragma GCC poison sprintf +# endif +#endif + extern char hostname_g[]; extern int interval_g;