solenv/bin/concat-deps.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
New commits:
commit f0cf5557d7e309e84ec997b8bdd84c6d029271d2
Author: Baptiste Daroussin <b...@freebsd.org>
Date: Sat Dec 12 12:49:49 2015 +0100
Fix build on BSDs
Change-Id: I88fbad89a78262f4c3275aa3a01fbebaacece245
Reviewed-on: https://gerrit.libreoffice.org/20660
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 4e6b432..2b5956f 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -33,9 +33,7 @@
#define CORE_LITTLE_ENDIAN
#endif /* Def _MSC_VER */
-#if defined(__linux) || defined(__OpenBSD__) || \
- defined(__FreeBSD__) || defined(__NetBSD__) || \
- defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#if defined(__linux) || defined(__FreeBSD_kernel__)
#include <sys/param.h>
#if __BYTE_ORDER == __LITTLE_ENDIAN
#undef CORE_BIG_ENDIAN
@@ -46,7 +44,21 @@
#undef CORE_LITTLE_ENDIAN
#endif /* __BYTE_ORDER == __BIG_ENDIAN */
#endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */
-#endif /* Def __linux || Def *BSD */
+#endif /* Def __linux */
+
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || \
+ defined(__NetBSD__) || defined(__DragonFly__)
+#include <machine/endian.h>
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+#undef CORE_BIG_ENDIAN
+#define CORE_LITTLE_ENDIAN
+#else /* !(_BYTE_ORDER == _LITTLE_ENDIAN) */
+#if _BYTE_ORDER == _BIG_ENDIAN
+#define CORE_BIG_ENDIAN
+#undef CORE_LITTLE_ENDIAN
+#endif /* _BYTE_ORDER == _BIG_ENDIAN */
+#endif /* !(_BYTE_ORDER == _LITTLE_ENDIAN) */
+#endif /* Def *BSD */
#ifdef __sun
#ifdef __sparc
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
