diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-29 04:30:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-29 04:30:00 -0500 |
| commit | 7943df571ae402862a6ace3a2539bd93153317f4 (patch) | |
| tree | 056387875644bf96cdbdd5d3de331e12ae774a36 /slirp/ip.h | |
| parent | d501f8478a3c12f50b8cf18214795f3d7c3d94bd (diff) | |
| parent | 917cfc1f266b554ea9ab4d958fa048bd27bce58f (diff) | |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
* kiszka/queues/slirp:
slirp: Avoid redefining MAX_TCPOPTLEN
slirp: Avoid statements without effect on Big Endian host
slirp: Untangle TCPOLEN_* from TCPOPT_*
Diffstat (limited to 'slirp/ip.h')
| -rw-r--r-- | slirp/ip.h | 20 |
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))) |