Auto-Merge pull request #2792 from rpv-tomsk/fix-5.8

Automatically merged due to "Automerge" label

diff --git a/src/stdendian.h b/src/stdendian.h
index 2fc569c..9ab0fb5 100644 (file)
--- a/src/stdendian.h
+++ b/src/stdendian.h
@@ -109,6 +109,23 @@
 #define __ENDIAN_DEFINED 1
 #endif /* sun */
 
+/* AIX */
+#if defined(_AIX)
+#include <sys/machine.h>
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define _LITTLE_ENDIAN 1234
+#define _BIG_ENDIAN 4321
+#define _BYTE_ORDER _LITTLE_ENDIAN
+#elif BYTE_ORDER == BIG_ENDIAN
+#define _LITTLE_ENDIAN 1234
+#define _BIG_ENDIAN 4321
+#define _BYTE_ORDER _BIG_ENDIAN
+#else
+#error Could not determine CPU byte order for AIX
+#endif
+#define __ENDIAN_DEFINED 1
+#endif /* AIX */
+
 /* Windows */
 #if defined(_WIN32) || defined(_MSC_VER)
 /* assumes all Microsoft targets are little endian */

diff --git a/src/utils_config_cores_test.c b/src/utils_config_cores_test.c
index 4809bd3..2c6f5b6 100644 (file)
--- a/src/utils_config_cores_test.c
+++ b/src/utils_config_cores_test.c
@@ -25,6 +25,8 @@
  *   Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
  **/
 
+#include "collectd.h"
+
 #include "testing.h"
 #include "utils_config_cores.c" /* sic */