diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2003-10-06 14:48:00 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2003-10-06 14:48:00 +0000 |
| commit | f7e5d494a2e75aca2aac12e6d169b21d59f83896 (patch) | |
| tree | b365129da5eb10ac4ed7e32e151c6a0461e17027 | |
| parent | 1de3e0789125e188ae48f5c53c5f85d3b1922e23 (diff) | |
| download | wireshark-f7e5d494a2e75aca2aac12e6d169b21d59f83896.tar.gz wireshark-f7e5d494a2e75aca2aac12e6d169b21d59f83896.tar.bz2 wireshark-f7e5d494a2e75aca2aac12e6d169b21d59f83896.zip | |
Replace the forward declaration of msg_parm_strings by moving the real
declaration from the middle of the file to the place of the forward
declaration. This should make MSVC happy.
Spotted and proposed fix by Ulf Lamping.
svn path=/trunk/; revision=8625
| -rw-r--r-- | packet-alcap.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/packet-alcap.c b/packet-alcap.c index 40b5ac8439..5847070c42 100644 --- a/packet-alcap.c +++ b/packet-alcap.c @@ -6,7 +6,7 @@ * Copyright 2003, Michael Lum <mlum [AT] telostech.com> * In association with Telos Technology Inc. * - * $Id: packet-alcap.c,v 1.1 2003/10/06 09:18:07 guy Exp $ + * $Id: packet-alcap.c,v 1.2 2003/10/06 14:48:00 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -76,7 +76,23 @@ return; \ } -static const value_string msg_parm_strings[]; +static const value_string msg_parm_strings[] = { + { 1, "Cause (CAU)" }, + { 2, "Connection element identifier (CEID)" }, + { 3, "Destination E.164 service endpoint address (ESEA)" }, + { 4, "Destination NSAP service endpoint address (NSEA)" }, + { 5, "Link characteristics (ALC)" }, + { 6, "Originating signalling association identifier (OSAID)" }, + { 7, "Served user generated reference (SUGR)" }, + { 8, "Served user transport (SUT)" }, + { 9, "Service specific information (audio) (SSIA)" }, + { 10, "Service specific information (multirate) (SSIM)" }, + { 11, "Service specific information (SAR-assured) (SSISA)" }, + { 12, "Service specific information (SAR-unassured) (SSISU)" }, + { 13, "Test connection identifier (TCI)" }, + { 0, NULL }, +}; +define NUM_PARMS (sizeof(msg_parm_strings)/sizeof(value_string)) static char *alcap_proto_name = "AAL type 2 signalling protocol - Capability set 1 (Q.2630.1)"; static char *alcap_proto_name_short = "ALCAP"; @@ -1493,23 +1509,6 @@ dis_parm_service_specific_info_unass(tvbuff_t *tvb, proto_tree *tree, guint len, EXTRANEOUS_DATA_CHECK(len, 0); } -static const value_string msg_parm_strings[] = { - { 1, "Cause (CAU)" }, - { 2, "Connection element identifier (CEID)" }, - { 3, "Destination E.164 service endpoint address (ESEA)" }, - { 4, "Destination NSAP service endpoint address (NSEA)" }, - { 5, "Link characteristics (ALC)" }, - { 6, "Originating signalling association identifier (OSAID)" }, - { 7, "Served user generated reference (SUGR)" }, - { 8, "Served user transport (SUT)" }, - { 9, "Service specific information (audio) (SSIA)" }, - { 10, "Service specific information (multirate) (SSIM)" }, - { 11, "Service specific information (SAR-assured) (SSISA)" }, - { 12, "Service specific information (SAR-unassured) (SSISU)" }, - { 13, "Test connection identifier (TCI)" }, - { 0, NULL }, -}; -#define NUM_PARMS (sizeof(msg_parm_strings)/sizeof(value_string)) static gint ett_parms[NUM_PARMS]; static void (*alcap_parm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) = { dis_parm_cause, /* Cause */ |