diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2006-04-27 02:19:33 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2006-04-27 02:19:33 +0000 |
| commit | 883d7ebb03b57a4d220776f62e5d28d54bedff38 (patch) | |
| tree | f1153f429bbcbeb553adf9f2052c4a332fd70fcd /sys/netinet/ip6.h | |
| parent | 23c97173b099220cf0b5da85d3b3050ef443855a (diff) | |
use underscore variants of _BYTE_ORDER macros which are always defined
ok deraadt millert
Diffstat (limited to 'sys/netinet/ip6.h')
| -rw-r--r-- | sys/netinet/ip6.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index 5ef86fe00b8..30577a8b662 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6.h,v 1.16 2004/07/09 09:14:12 itojun Exp $ */ +/* $OpenBSD: ip6.h,v 1.17 2006/04/27 02:19:32 tedu Exp $ */ /* $KAME: ip6.h,v 1.45 2003/06/05 04:46:38 keiichi Exp $ */ /* @@ -93,14 +93,14 @@ struct ip6_hdr { #define IPV6_VERSION 0x60 #define IPV6_VERSION_MASK 0xf0 -#if BYTE_ORDER == BIG_ENDIAN +#if _BYTE_ORDER == _BIG_ENDIAN #define IPV6_FLOWINFO_MASK 0x0fffffff /* flow info (28 bits) */ #define IPV6_FLOWLABEL_MASK 0x000fffff /* flow label (20 bits) */ #else -#if BYTE_ORDER == LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN #define IPV6_FLOWINFO_MASK 0xffffff0f /* flow info (28 bits) */ #define IPV6_FLOWLABEL_MASK 0xffff0f00 /* flow label (20 bits) */ -#endif /* LITTLE_ENDIAN */ +#endif /* _LITTLE_ENDIAN */ #endif #if 1 /* ECN bits proposed by Sally Floyd */ @@ -207,16 +207,16 @@ struct ip6_opt_router { u_int8_t ip6or_value[2]; } __packed; /* Router alert values (in network byte order) */ -#if BYTE_ORDER == BIG_ENDIAN +#if _BYTE_ORDER == _BIG_ENDIAN #define IP6_ALERT_MLD 0x0000 #define IP6_ALERT_RSVP 0x0001 #define IP6_ALERT_AN 0x0002 #else -#if BYTE_ORDER == LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN #define IP6_ALERT_MLD 0x0000 #define IP6_ALERT_RSVP 0x0100 #define IP6_ALERT_AN 0x0200 -#endif /* LITTLE_ENDIAN */ +#endif /* _LITTLE_ENDIAN */ #endif /* Routing header */ @@ -245,15 +245,15 @@ struct ip6_frag { u_int32_t ip6f_ident; /* identification */ } __packed; -#if BYTE_ORDER == BIG_ENDIAN +#if _BYTE_ORDER == _BIG_ENDIAN #define IP6F_OFF_MASK 0xfff8 /* mask out offset from _offlg */ #define IP6F_RESERVED_MASK 0x0006 /* reserved bits in ip6f_offlg */ #define IP6F_MORE_FRAG 0x0001 /* more-fragments flag */ -#else /* BYTE_ORDER == LITTLE_ENDIAN */ +#else /* _BYTE_ORDER == _LITTLE_ENDIAN */ #define IP6F_OFF_MASK 0xf8ff /* mask out offset from _offlg */ #define IP6F_RESERVED_MASK 0x0600 /* reserved bits in ip6f_offlg */ #define IP6F_MORE_FRAG 0x0100 /* more-fragments flag */ -#endif /* BYTE_ORDER == LITTLE_ENDIAN */ +#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */ /* * Internet implementation parameters. |