diff options
| author | grothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-01-30 21:32:10 +0000 |
|---|---|---|
| committer | grothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-01-30 21:32:10 +0000 |
| commit | 254691a2d9d300f6eecb7a5a929301eaca4321f5 (patch) | |
| tree | 80018eff689be498766c83870bcf161095837c7a | |
| parent | 9e0ffde11d198d2058d36b942e7149de9430e239 (diff) | |
-improve byteorder macro checks for FreeBSD
git-svn-id: https://gnunet.org/svn/gnunet@19551 140774ce-b5e7-0310-ab8b-a85725594a96
| -rw-r--r-- | src/include/gnunet_tun_lib.h | 12 | ||||
| -rw-r--r-- | src/util/common_endian.c | 14 |
2 files changed, 17 insertions, 9 deletions
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h index 5bac236d97..f11a3af3e4 100644 --- a/src/include/gnunet_tun_lib.h +++ b/src/include/gnunet_tun_lib.h @@ -70,12 +70,14 @@ struct GNUNET_TUN_Layer2PacketHeader */ struct GNUNET_TUN_IPv4Header { -#if __BYTE_ORDER == __LITTLE_ENDIAN +#if __BYTE_ORDER == __LITTLE_ENDIAN || _BYTE_ORDER == _LITTLE_ENDIAN unsigned int header_length:4 GNUNET_PACKED; unsigned int version:4 GNUNET_PACKED; -#elif __BYTE_ORDER == __BIG_ENDIAN +#elif __BYTE_ORDER == __BIG_ENDIAN || _BYTE_ORDER == _BIG_ENDIAN unsigned int version:4 GNUNET_PACKED; unsigned int header_length:4 GNUNET_PACKED; +#else + #error byteorder undefined #endif uint8_t diff_serv; @@ -125,15 +127,17 @@ struct GNUNET_TUN_IPv4Header */ struct GNUNET_TUN_IPv6Header { -#if __BYTE_ORDER == __LITTLE_ENDIAN +#if __BYTE_ORDER == __LITTLE_ENDIAN || _BYTE_ORDER == _LITTLE_ENDIAN unsigned int traffic_class_h:4 GNUNET_PACKED; unsigned int version:4 GNUNET_PACKED; unsigned int traffic_class_l:4 GNUNET_PACKED; unsigned int flow_label:20 GNUNET_PACKED; -#elif __BYTE_ORDER == __BIG_ENDIAN +#elif __BYTE_ORDER == __BIG_ENDIAN || _BYTE_ORDER == _BIG_ENDIAN unsigned int version:4 GNUNET_PACKED; unsigned int traffic_class:8 GNUNET_PACKED; unsigned int flow_label:20 GNUNET_PACKED; +#else + #error byteorder undefined #endif /** * Length of the payload, excluding this header. diff --git a/src/util/common_endian.c b/src/util/common_endian.c index 56aa7b0c4e..1867ba01d9 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 } |