diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-12-06 20:20:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-12-06 20:20:35 +0000 |
| commit | e5120ef69e2b46328400a0ede487822c25ee6efa (patch) | |
| tree | f68cd5b4446f23826af795e86c1d647b6efc026d /packet-ipv6.h | |
| parent | 9c863db0d9d5bad152d823f6fffa9d8964e0a598 (diff) | |
| download | wireshark-e5120ef69e2b46328400a0ede487822c25ee6efa.tar.gz wireshark-e5120ef69e2b46328400a0ede487822c25ee6efa.tar.bz2 wireshark-e5120ef69e2b46328400a0ede487822c25ee6efa.zip | |
Use WORDS_BIGENDIAN, rather than BYTE_ORDER, to determine which values
to use for IPV6_FLOWINFO_MASK and IPV6_FLOWLABEL_MASK. WORDS_BIGENDIAN
is defined as long as you include "config.h"; BYTE_ORDER is defined only
if you include "global.h" (or if your OS *happens* to define it in an
include file that's being included), and we're trimming the number of
files that include "global.h".
svn path=/trunk/; revision=1230
Diffstat (limited to 'packet-ipv6.h')
| -rw-r--r-- | packet-ipv6.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packet-ipv6.h b/packet-ipv6.h index 57cd880942..424c61eb5a 100644 --- a/packet-ipv6.h +++ b/packet-ipv6.h @@ -1,7 +1,7 @@ /* packet-ipv6.h * Definitions for IPv6 packet disassembly * - * $Id: packet-ipv6.h,v 1.10 1999/12/06 18:33:49 gram Exp $ + * $Id: packet-ipv6.h,v 1.11 1999/12/06 20:20:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -92,14 +92,13 @@ struct ip6_hdr { #define IP6H_SRC 8 #define IP6H_DST 24 -#if BYTE_ORDER == BIG_ENDIAN +#ifdef WORDS_BIGENDIAN #define IPV6_FLOWINFO_MASK 0x0fffffff /* flow info (28 bits) */ #define IPV6_FLOWLABEL_MASK 0x000fffff /* flow label (20 bits) */ -#endif /* BIG_ENDIAN */ -#if BYTE_ORDER == LITTLE_ENDIAN +#else #define IPV6_FLOWINFO_MASK 0xffffff0f /* flow info (28 bits) */ #define IPV6_FLOWLABEL_MASK 0xffff0f00 /* flow label (20 bits) */ -#endif /* LITTLE_ENDIAN */ +#endif /* * Extension Headers |