From 20894ae3fa98f82da925fbeb72e616eef509758a Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 10 May 2010 17:07:36 -0700 Subject: Upstream: HOST_WORDS_ALIGNED -> WORDS_ALIGNED Change-Id: Ica9022695d83fb48a8c25fdb1e1f0dc1c63747ff --- slirp/ip.h | 6 +++--- slirp/slirp_config.h | 2 +- slirp/tcp.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'slirp') diff --git a/slirp/ip.h b/slirp/ip.h index 7a7a9b9..63e18a6 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -33,7 +33,7 @@ #ifndef _IP_H_ #define _IP_H_ -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN # ifndef NTOHL # define NTOHL(d) # endif @@ -73,7 +73,7 @@ typedef u_int32_t n_long; /* long as received from the net */ * Structure of an internet header, naked of options. */ struct ip { -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN u_int ip_v:4, /* version */ ip_hl:4; /* header length */ #else @@ -139,7 +139,7 @@ struct ip_timestamp { u_int8_t ipt_code; /* IPOPT_TS */ u_int8_t ipt_len; /* size of structure (variable) */ u_int8_t ipt_ptr; /* index of current entry */ -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN u_int ipt_oflw:4, /* overflow counter */ ipt_flg:4; /* flags, see below */ #else diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h index dbc8dfd..2ee3c9c 100644 --- a/slirp/slirp_config.h +++ b/slirp/slirp_config.h @@ -86,7 +86,7 @@ #undef HAVE_SYS_BITYPES_H /* Define if the machine is big endian */ -//#undef WORDS_BIGENDIAN +//#undef HOST_WORDS_BIGENDIAN /* Define if your sprintf returns char * instead of int */ #undef BAD_SPRINTF diff --git a/slirp/tcp.h b/slirp/tcp.h index 4057032..d00c489 100644 --- a/slirp/tcp.h +++ b/slirp/tcp.h @@ -52,7 +52,7 @@ struct tcphdr { u_int16_t th_dport; /* destination port */ tcp_seq th_seq; /* sequence number */ tcp_seq th_ack; /* acknowledgement number */ -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN u_int th_off:4, /* data offset */ th_x2:4; /* (unused) */ #else -- cgit v1.1