[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19551 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19551 - in gnunet/src: include util |
Date: |
Mon, 30 Jan 2012 22:32:10 +0100 |
Author: grothoff
Date: 2012-01-30 22:32:10 +0100 (Mon, 30 Jan 2012)
New Revision: 19551
Modified:
gnunet/src/include/gnunet_tun_lib.h
gnunet/src/util/common_endian.c
Log:
-improve byteorder macro checks for FreeBSD
Modified: gnunet/src/include/gnunet_tun_lib.h
===================================================================
--- gnunet/src/include/gnunet_tun_lib.h 2012-01-30 21:21:49 UTC (rev 19550)
+++ gnunet/src/include/gnunet_tun_lib.h 2012-01-30 21:32:10 UTC (rev 19551)
@@ -70,12 +70,14 @@
*/
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_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.
Modified: gnunet/src/util/common_endian.c
===================================================================
--- gnunet/src/util/common_endian.c 2012-01-30 21:21:49 UTC (rev 19550)
+++ gnunet/src/util/common_endian.c 2012-01-30 21:32:10 UTC (rev 19551)
@@ -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;
+#elif __BYTE_ORDER == __LITTLE_ENDIAN || _BYTE_ORDER == _LITTLE_ENDIAN
+ return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
#else
- return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
+ #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;
+#elif __BYTE_ORDER == __LITTLE_ENDIAN || _BYTE_ORDER == _LITTLE_ENDIAN
+ return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
#else
- return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
+ #error byteorder undefined
#endif
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19551 - in gnunet/src: include util,
gnunet <=