diff options
| -rw-r--r-- | sys/netatalk/ddp.h | 38 | ||||
| -rw-r--r-- | sys/netinet/tcp_var.h | 6 | ||||
| -rw-r--r-- | sys/netinet6/in6_var.h | 22 |
3 files changed, 33 insertions, 33 deletions
diff --git a/sys/netatalk/ddp.h b/sys/netatalk/ddp.h index bdd3e53e147..4342189f374 100644 --- a/sys/netatalk/ddp.h +++ b/sys/netatalk/ddp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ddp.h,v 1.1 1997/07/23 03:39:53 denny Exp $ */ +/* $OpenBSD: ddp.h,v 1.2 2005/12/11 17:21:53 deraadt Exp $ */ /* * Copyright (c) 1990,1991 Regents of The University of Michigan. @@ -125,19 +125,19 @@ struct ddpehdr { union { struct { #if BYTE_ORDER == BIG_ENDIAN - unsigned dub_pad:2; - unsigned dub_hops:4; - unsigned dub_len:10; - unsigned dub_sum:16; + unsigned int dub_pad:2; + unsigned int dub_hops:4; + unsigned int dub_len:10; + unsigned int dub_sum:16; #endif #if BYTE_ORDER == LITTLE_ENDIAN - unsigned dub_sum:16; - unsigned dub_len:10; - unsigned dub_hops:4; - unsigned dub_pad:2; + unsigned int dub_sum:16; + unsigned int dub_len:10; + unsigned int dub_hops:4; + unsigned int dub_pad:2; #endif } du_bits; - unsigned du_bytes; + unsigned int du_bytes; } deh_u; #define deh_pad deh_u.du_bits.dub_pad #define deh_hops deh_u.du_bits.dub_hops @@ -158,19 +158,19 @@ struct ddpshdr { union { struct { #if BYTE_ORDER == BIG_ENDIAN - unsigned dub_pad:6; - unsigned dub_len:10; - unsigned dub_dport:8; - unsigned dub_sport:8; + unsigned int dub_pad:6; + unsigned int dub_len:10; + unsigned int dub_dport:8; + unsigned int dub_sport:8; #endif #if BYTE_ORDER == LITTLE_ENDIAN - unsigned dub_sport:8; - unsigned dub_dport:8; - unsigned dub_len:10; - unsigned dub_pad:6; + unsigned int dub_sport:8; + unsigned int dub_dport:8; + unsigned int dub_len:10; + unsigned int dub_pad:6; #endif } du_bits; - unsigned du_bytes; + unsigned int du_bytes; } dsh_u; #define dsh_pad dsh_u.du_bits.dub_pad #define dsh_len dsh_u.du_bits.dub_len diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 299c03eb068..5e8fae21e60 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_var.h,v 1.79 2005/11/20 19:25:16 brad Exp $ */ +/* $OpenBSD: tcp_var.h,v 1.80 2005/12/11 17:21:53 deraadt Exp $ */ /* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */ /* @@ -290,8 +290,8 @@ struct syn_cache { struct mbuf *sc_ipopts; /* IP options */ u_int16_t sc_peermaxseg; u_int16_t sc_ourmaxseg; - u_int8_t sc_request_r_scale : 4, - sc_requested_s_scale : 4; + u_int sc_request_r_scale : 4, + sc_requested_s_scale : 4; struct tcpcb *sc_tp; /* tcb for listening socket */ LIST_ENTRY(syn_cache) sc_tpq; /* list of entries by same tp */ diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index f1de565a740..5cfc1c60d71 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_var.h,v 1.25 2005/09/19 19:36:49 brad Exp $ */ +/* $OpenBSD: in6_var.h,v 1.26 2005/12/11 17:21:53 deraadt Exp $ */ /* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */ /* @@ -272,10 +272,10 @@ struct in6_aliasreq { * user land command(ifconfig) and daemon(rtadvd). */ struct prf_ra { - u_char onlink : 1; - u_char autonomous : 1; - u_char router : 1; - u_char reserved : 5; + u_int onlink : 1; + u_int autonomous : 1; + u_int router : 1; + u_int reserved : 5; }; struct in6_prflags { @@ -284,9 +284,9 @@ struct in6_prflags { u_short prf_reserved2; /* want to put this on 4byte offset */ struct prf_rr { - u_char decrvalid : 1; - u_char decrprefd : 1; - u_char reserved : 6; + u_int decrvalid : 1; + u_int decrprefd : 1; + u_int reserved : 6; } prf_rr; u_char prf_reserved3; u_short prf_reserved4; @@ -324,9 +324,9 @@ struct in6_rrenumreq { u_char irr_u_uselen; /* uselen for adding prefix */ u_char irr_u_keeplen; /* keeplen from matching prefix */ struct irr_raflagmask { - u_char onlink : 1; - u_char autonomous : 1; - u_char reserved : 6; + u_int onlink : 1; + u_int autonomous : 1; + u_int reserved : 6; } irr_raflagmask; u_int32_t irr_vltime; u_int32_t irr_pltime; |