diff options
author | Guy Harris <guy@alum.mit.edu> | 2003-10-13 20:53:30 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2003-10-13 20:53:30 +0000 |
commit | 2765a6a878c8a8a222c5e9533c6974800bd88037 (patch) | |
tree | 003f6a9aecdcc94f1a817c398a2d30b1a1179ce3 /packet-diffserv-mpls-common.h | |
parent | be4197e744a7bef10fd409ca8384c8b6d6e89070 (diff) | |
download | wireshark-2765a6a878c8a8a222c5e9533c6974800bd88037.tar.gz |
Define "phbit_bit{14,15}_vals" in packet-diffserv-mpls-common.c, not in
the header file; just declare it in the header file - that way, there's
one shared version of both tables, and we don't get compiler warnings
because they're not actually used in packet-diffserv-mpls-common.c.
svn path=/trunk/; revision=8683
Diffstat (limited to 'packet-diffserv-mpls-common.h')
-rw-r--r-- | packet-diffserv-mpls-common.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/packet-diffserv-mpls-common.h b/packet-diffserv-mpls-common.h index 1064b4ee78..4df889c2a7 100644 --- a/packet-diffserv-mpls-common.h +++ b/packet-diffserv-mpls-common.h @@ -2,7 +2,7 @@ * Routines for the common part of Diffserv MPLS signaling protocols * Author: Endoh Akira (endoh@netmarks.co.jp) * - * $Id: packet-diffserv-mpls-common.h,v 1.1 2003/10/10 21:16:24 guy Exp $ + * $Id: packet-diffserv-mpls-common.h,v 1.2 2003/10/13 20:53:30 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,17 +41,9 @@ #define PHBID_BIT15_DESCRIPTION "Bit 15" -static const value_string phbid_bit14_vals[] = { - {0, "Single PHB"}, - {1, "Set of PHBs"}, - {0, NULL} -}; +extern const value_string phbid_bit14_vals[]; -static const value_string phbid_bit15_vals[] = { - {0, "PHBs defined by standards action"}, - {1, "PHBs not defined by standards action"}, - {0, NULL} -}; +extern const value_string phbid_bit15_vals[]; void dissect_diffserv_mpls_common(tvbuff_t *tvb, proto_tree *tree, int type, |