Merge branch 'collectd-4.3' into collectd-4.4

diff --git a/src/collectd.h b/src/collectd.h
index 80d86ba..55aac16 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -127,12 +127,16 @@
 #endif
 
 #ifndef BYTE_ORDER
-# ifdef __BYTE_ORDER
+# if defined(_BYTE_ORDER)
+#  define BYTE_ORDER _BYTE_ORDER
+# elif defined(__BYTE_ORDER)
 #  define BYTE_ORDER __BYTE_ORDER
 # endif
 #endif
 #ifndef BIG_ENDIAN
-# ifdef __BIG_ENDIAN
+# if defined(_BIG_ENDIAN)
+#  define BIG_ENDIAN _BIG_ENDIAN
+# elif defined(__BIG_ENDIAN)
 #  define BIG_ENDIAN __BIG_ENDIAN
 # endif
 #endif