Merge branch 'origin/master' (early part)

Conflicts:
	include/platform.h

1 files changed, 8 insertions, 2 deletions

diff --git a/include/platform.h b/include/platform.h
index 9458e2e02..2f3639d9c 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -178,7 +178,7 @@
 # define bswap_16(x) ((((x) & 0xFF00) >> 8) | (((x) & 0xFF) << 8))
 # define bswap_32(x) ((bswap_16(((x) & 0xFFFF0000L) >> 16)) | (bswap_16((x) & 0xFFFFL) << 16))
 # define bswap_64(x) ((bswap_32(((x) & 0xFFFFFFFF00000000LL) >> 32)) | (bswap_32((x) & 0xFFFFFFFFLL) << 32))
-#elif !defined __APPLE__
+#elif !defined __APPLE__ && !defined __OpenBSD__
 # include <byteswap.h>
 # include <endian.h>
 #endif
@@ -189,9 +189,15 @@
 #elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN
 # define BB_BIG_ENDIAN 1
 # define BB_LITTLE_ENDIAN 0
+#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _BIG_ENDIAN
+# define BB_BIG_ENDIAN 1
+# define BB_LITTLE_ENDIAN 0
 #elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__)
 # define BB_BIG_ENDIAN 0
 # define BB_LITTLE_ENDIAN 1
+#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN
+# define BB_BIG_ENDIAN 0
+# define BB_LITTLE_ENDIAN 1
 #else
 # error "Can't determine endianness"
 #endif
@@ -247,7 +253,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
 /* ---- Compiler dependent settings ------------------------- */
 
 #if (defined __digital__ && defined __unix__) \
- || defined __APPLE__ || defined __FreeBSD__ \
+ || defined __APPLE__ || defined __FreeBSD__ || defined __OpenBSD__ \
  || ENABLE_PLATFORM_MINGW32
 # undef HAVE_MNTENT_H
 # undef HAVE_SYS_STATFS_H