From b6dce92e8917762e6bf81e177b20a0b7909a0532 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 22 Jul 2010 22:15:23 +0200 Subject: slirp: Replace u_int8_t, u_int16_t, u_int32_t, u_int64_t by standard int types There is no need to have a second set of integral types. Replace them by the standard types from stdint.h. Signed-off-by: Stefan Weil Signed-off-by: Aurelien Jarno --- slirp/tcp_output.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'slirp/tcp_output.c') diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c index 0d6011ac64..779314bf9a 100644 --- a/slirp/tcp_output.c +++ b/slirp/tcp_output.c @@ -263,11 +263,11 @@ send: if (flags & TH_SYN) { tp->snd_nxt = tp->iss; if ((tp->t_flags & TF_NOOPT) == 0) { - u_int16_t mss; + uint16_t mss; opt[0] = TCPOPT_MAXSEG; opt[1] = 4; - mss = htons((u_int16_t) tcp_mss(tp, 0)); + mss = htons((uint16_t) tcp_mss(tp, 0)); memcpy((caddr_t)(opt + 2), (caddr_t)&mss, sizeof(mss)); optlen = 4; } @@ -364,10 +364,10 @@ send: win = (long)TCP_MAXWIN << tp->rcv_scale; if (win < (long)(tp->rcv_adv - tp->rcv_nxt)) win = (long)(tp->rcv_adv - tp->rcv_nxt); - ti->ti_win = htons((u_int16_t) (win>>tp->rcv_scale)); + ti->ti_win = htons((uint16_t) (win>>tp->rcv_scale)); if (SEQ_GT(tp->snd_up, tp->snd_una)) { - ti->ti_urp = htons((u_int16_t)(tp->snd_up - ntohl(ti->ti_seq))); + ti->ti_urp = htons((uint16_t)(tp->snd_up - ntohl(ti->ti_seq))); ti->ti_flags |= TH_URG; } else /* @@ -383,7 +383,7 @@ send: * checksum extended header and data. */ if (len + optlen) - ti->ti_len = htons((u_int16_t)(sizeof (struct tcphdr) + + ti->ti_len = htons((uint16_t)(sizeof (struct tcphdr) + optlen + len)); ti->ti_sum = cksum(m, (int)(hdrlen + len)); -- cgit v1.2.3