aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorAndreas Färber <andreas.faerber@web.de>2012-05-28 19:34:20 +0200
committerJan Kiszka <jan.kiszka@siemens.com>2012-05-28 22:31:07 +0200
commit9b24d8e987d1249836cd4bccebf7c3a33025b293 (patch)
treeb9893e81d5a9e8d18f4289d23551a2d01a1bf468 /slirp
parente20e48a8020a3b95eea28c89310d2ff14ad4aca2 (diff)
downloadqemu-arm-9b24d8e987d1249836cd4bccebf7c3a33025b293.tar.gz
slirp: Avoid statements without effect on Big Endian host
Darwin has HTON*/NTOH* macros that on BE simply return the argument. This is incompatible with SLIRP's use of these macros as a statement. Undefine the macros in the HOST_WORDS_BIGENDIAN code path to redefine these macros as no-op, as already done when they were undefined. Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'slirp')
-rw-r--r--slirp/ip.h20
1 files changed, 8 insertions, 12 deletions
diff --git a/slirp/ip.h b/slirp/ip.h
index 88c903fccd..e2ee5e304c 100644
--- a/slirp/ip.h
+++ b/slirp/ip.h
@@ -34,18 +34,14 @@
#define _IP_H_
#ifdef HOST_WORDS_BIGENDIAN
-# ifndef NTOHL
-# define NTOHL(d)
-# endif
-# ifndef NTOHS
-# define NTOHS(d)
-# endif
-# ifndef HTONL
-# define HTONL(d)
-# endif
-# ifndef HTONS
-# define HTONS(d)
-# endif
+# undef NTOHL
+# undef NTOHS
+# undef HTONL
+# undef HTONS
+# define NTOHL(d)
+# define NTOHS(d)
+# define HTONL(d)
+# define HTONS(d)
#else
# ifndef NTOHL
# define NTOHL(d) ((d) = ntohl((d)))