Cleanup: standardise include path

[lttng-ust.git] / include / lttng / ust-endian.h

diff --git a/include/lttng/ust-endian.h b/include/lttng/ust-endian.h
index f676162b067a1ec2f61bdf856e7a1d5402b62537..763a447e6fcb16bfaa8f882f20caff5d24e66eb0 100644 (file)
--- a/include/lttng/ust-endian.h
+++ b/include/lttng/ust-endian.h
@@ -29,12 +29,32 @@
 
 #if (defined(__linux__) || defined(__CYGWIN__))
 #include <endian.h>
+#include <byteswap.h>
 #elif defined(__FreeBSD__)
-#include <machine/endian.h>
+#include <sys/endian.h>
+#define bswap_16(x)    bswap16(x)
+#define bswap_32(x)    bswap32(x)
+#define bswap_64(x)    bswap64(x)
 #else
 #error "Please add support for your OS."
 #endif
 
+/*
+ * BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN are only defined on Linux
+ * if __USE_BSD is defined. Force their definition.
+ */
+#ifndef BYTE_ORDER
+#define BYTE_ORDER __BYTE_ORDER
+#endif
+
+#ifndef LITTLE_ENDIAN
+#define LITTLE_ENDIAN __LITTLE_ENDIAN
+#endif
+
+#ifndef BIG_ENDIAN
+#define BIG_ENDIAN __BIG_ENDIAN
+#endif
+
 #ifndef FLOAT_WORD_ORDER
 #ifdef __FLOAT_WORD_ORDER
 #define FLOAT_WORD_ORDER       __FLOAT_WORD_ORDER