diff options
| author | bde <bde@FreeBSD.org> | 1998-06-08 09:47:47 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-06-08 09:47:47 +0000 |
| commit | 566ee5c323c868aba9bdc6c3d1ad52a3dd7b17e9 (patch) | |
| tree | 60516df8ad7a4fdc14c976a4578f7bf48ed75610 /sys/netinet | |
| parent | faa17713f8d56432bac81058b7e1d2596e19c5b1 (diff) | |
| download | FreeBSD-src-566ee5c323c868aba9bdc6c3d1ad52a3dd7b17e9.zip FreeBSD-src-566ee5c323c868aba9bdc6c3d1ad52a3dd7b17e9.tar.gz | |
Fixed pedantic semantics errors (bitfields not of type int, signed int
or unsigned int (this doesn't change the struct layout, size or
alignment in any of the files changed in this commit, at least for
gcc on i386's. Using bitfields of type u_char may affect size and
alignment but not packing)).
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_fil.h | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_var.h | 6 | ||||
| -rw-r--r-- | sys/netinet/tcp.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h index 266fb22..ebaab4c 100644 --- a/sys/netinet/ip_fil.h +++ b/sys/netinet/ip_fil.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_fil.h 1.35 6/5/96 - * $Id: ip_fil.h,v 1.3 1998/06/07 17:12:15 dfr Exp $ + * $Id: ip_fil.h,v 1.4 1998/06/08 06:04:11 bde Exp $ */ #ifndef __IP_FIL_H__ @@ -82,8 +82,8 @@ #define SIOCINSFR SIOCINAFR typedef struct fr_ip { - u_char fi_v:4; /* IP version */ - u_char fi_fl:4; /* packet flags */ + u_int fi_v:4; /* IP version */ + u_int fi_fl:4; /* packet flags */ u_char fi_tos; u_char fi_ttl; u_char fi_p; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index d68d2cf..9559a3e 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $Id: ip_var.h,v 1.39 1998/06/05 22:40:01 julian Exp $ + * $Id: ip_var.h,v 1.40 1998/06/06 19:39:10 julian Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -76,11 +76,11 @@ struct ipq { */ struct ipasfrag { #if BYTE_ORDER == LITTLE_ENDIAN - u_char ip_hl:4, + u_int ip_hl:4, ip_v:4; #endif #if BYTE_ORDER == BIG_ENDIAN - u_char ip_v:4, + u_int ip_v:4, ip_hl:4; #endif u_char ipf_mff; /* XXX overlays ip_tos: use low bit diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 3585917..253ddb3 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp.h 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: tcp.h,v 1.8 1997/02/22 09:41:37 peter Exp $ */ #ifndef _NETINET_TCP_H_ @@ -50,11 +50,11 @@ struct tcphdr { tcp_seq th_seq; /* sequence number */ tcp_seq th_ack; /* acknowledgement number */ #if BYTE_ORDER == LITTLE_ENDIAN - u_char th_x2:4, /* (unused) */ + u_int th_x2:4, /* (unused) */ th_off:4; /* data offset */ #endif #if BYTE_ORDER == BIG_ENDIAN - u_char th_off:4, /* data offset */ + u_int th_off:4, /* data offset */ th_x2:4; /* (unused) */ #endif u_char th_flags; |
