-improve byteorder macro checks for FreeBSD

1 files changed, 9 insertions, 5 deletions

diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index 56aa7b0c4..1867ba01d 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2006, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -32,20 +32,24 @@
 uint64_t
 GNUNET_ntohll (uint64_t n)
 {
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN || _BYTE_ORDER == _BIG_ENDIAN
   return n;
-#else
+#elif __BYTE_ORDER == __LITTLE_ENDIAN  || _BYTE_ORDER == _LITTLE_ENDIAN
   return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
+#else
+  #error byteorder undefined
 #endif
 }
 
 uint64_t
 GNUNET_htonll (uint64_t n)
 {
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN || _BYTE_ORDER == _BIG_ENDIAN
   return n;
-#else
+#elif __BYTE_ORDER == __LITTLE_ENDIAN  || _BYTE_ORDER == _LITTLE_ENDIAN
   return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
+#else
+  #error byteorder undefined
 #endif
 }