diff options
| author | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
| commit | 1afa194a0a3384c5a8fd150e4335d332c22883cf (patch) | |
| tree | 87d1ca2dbfb03128e628e344a713297131bad7f7 /slirp | |
| parent | 157f2662fb4dd8f02885027e47f79fbee83c7b94 (diff) | |
| parent | f1a7104a5f435a1bf2a1158e6f737dbd89e8c153 (diff) | |
| download | focaccia-qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.gz focaccia-qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/ip.h | 8 | ||||
| -rw-r--r-- | slirp/tcp.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/slirp/ip.h b/slirp/ip.h index 48ea38e5ec..72dbe9a5d9 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -74,10 +74,10 @@ typedef uint32_t n_long; /* long as received from the net */ */ struct ip { #ifdef HOST_WORDS_BIGENDIAN - u_int ip_v:4, /* version */ + uint8_t ip_v:4, /* version */ ip_hl:4; /* header length */ #else - u_int ip_hl:4, /* header length */ + uint8_t ip_hl:4, /* header length */ ip_v:4; /* version */ #endif uint8_t ip_tos; /* type of service */ @@ -140,10 +140,10 @@ struct ip_timestamp { uint8_t ipt_len; /* size of structure (variable) */ uint8_t ipt_ptr; /* index of current entry */ #ifdef HOST_WORDS_BIGENDIAN - u_int ipt_oflw:4, /* overflow counter */ + uint8_t ipt_oflw:4, /* overflow counter */ ipt_flg:4; /* flags, see below */ #else - u_int ipt_flg:4, /* flags, see below */ + uint8_t ipt_flg:4, /* flags, see below */ ipt_oflw:4; /* overflow counter */ #endif union ipt_timestamp { diff --git a/slirp/tcp.h b/slirp/tcp.h index 9d06836626..b3817cb13c 100644 --- a/slirp/tcp.h +++ b/slirp/tcp.h @@ -51,10 +51,10 @@ struct tcphdr { tcp_seq th_seq; /* sequence number */ tcp_seq th_ack; /* acknowledgement number */ #ifdef HOST_WORDS_BIGENDIAN - u_int th_off:4, /* data offset */ + uint8_t th_off:4, /* data offset */ th_x2:4; /* (unused) */ #else - u_int th_x2:4, /* (unused) */ + uint8_t th_x2:4, /* (unused) */ th_off:4; /* data offset */ #endif uint8_t th_flags; |