diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2014-01-07 17:25:20 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2014-01-07 17:25:20 +0000 |
| commit | 3dbebff4f2e47c2a40eacf383565f251b21cfcab (patch) | |
| tree | 86e8a718555f2931ff574234103e4fb984987014 | |
| parent | 74394f2cf7ac48e39c7bc058b4db3217c89c36c8 (diff) | |
Fix
warning: redundant redeclaration of 'zbee_get_bit_field'
warning: redundant redeclaration of 'zbee_aps_cid_names'
svn path=/trunk/; revision=54624
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk-gp.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.h | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-general.c | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 20681450ce..41fb2ac270 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -270,12 +270,6 @@ typedef struct { #define ZBEE_NWK_GP_MANUF_GREENPEAK_IZRHS 0x0003 /*********************/ -/* Extern Constants. */ -/*********************/ - -extern const value_string zbee_aps_cid_names[]; - -/*********************/ /* Global variables. */ /*********************/ diff --git a/epan/dissectors/packet-zbee-nwk.h b/epan/dissectors/packet-zbee-nwk.h index b1f595f906..db08efd5d2 100644 --- a/epan/dissectors/packet-zbee-nwk.h +++ b/epan/dissectors/packet-zbee-nwk.h @@ -194,7 +194,4 @@ extern GHashTable *zbee_table_link_keyring; #define ZBEE_NWK_BEACON_NETWORK_DEPTH 0x78 #define ZBEE_NWK_BEACON_END_DEVICE_CAPACITY 0x80 -/* Function declarations. */ -guint zbee_get_bit_field(guint input, guint mask); - #endif /* PACKET_ZBEE_NWK_H */ diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 044588443c..f1bde026a9 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -1157,7 +1157,6 @@ static void dissect_zcl_part_cmd_id (proto_tree* tree, tvbuff_t* /*************************/ /* Global Variables */ /*************************/ -extern const value_string zbee_aps_cid_names[]; /* Initialize the protocol and registered fields */ static int proto_zbee_zcl_part = -1; |