projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-more libexec fixes for OpenSUSE
[oweals/gnunet.git]
/
src
/
util
/
common_endian.c
diff --git
a/src/util/common_endian.c
b/src/util/common_endian.c
index 1867ba01d90a45f1c026c3ec266624b0b03c04f9..117e575e4b228ec3341331a46800f516b0566469 100644
(file)
--- a/
src/util/common_endian.c
+++ b/
src/util/common_endian.c
@@
-32,9
+32,9
@@
uint64_t
GNUNET_ntohll (uint64_t n)
{
uint64_t
GNUNET_ntohll (uint64_t n)
{
-#if __BYTE_ORDER == __BIG_ENDIAN
|| _BYTE_ORDER == _BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
return n;
return n;
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
|| _BYTE_ORDER == _LITTLE_ENDIAN
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
#else
#error byteorder undefined
return (((uint64_t) ntohl (n)) << 32) + ntohl (n >> 32);
#else
#error byteorder undefined
@@
-44,9
+44,9
@@
GNUNET_ntohll (uint64_t n)
uint64_t
GNUNET_htonll (uint64_t n)
{
uint64_t
GNUNET_htonll (uint64_t n)
{
-#if __BYTE_ORDER == __BIG_ENDIAN
|| _BYTE_ORDER == _BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
return n;
return n;
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
|| _BYTE_ORDER == _LITTLE_ENDIAN
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
#else
#error byteorder undefined
return (((uint64_t) htonl (n)) << 32) + htonl (n >> 32);
#else
#error byteorder undefined