diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2005-10-25 18:38:47 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2005-10-25 18:38:47 +0000 |
| commit | 8c28eb9648e3217e203b10b0f23a3e084f3363f7 (patch) | |
| tree | fea6e5590eba1bc54f4acee73f5ada0aa4e792e6 | |
| parent | 7ca1457f357069f1e939258f2de425298ae32a21 (diff) | |
Avoid a conflict in global symbols by declaring some variables static.
svn path=/trunk/; revision=16310
| -rw-r--r-- | asn1/nbap/packet-nbap-template.c | 8 | ||||
| -rw-r--r-- | asn1/ranap/packet-ranap-template.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-ranap.c | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 981c7393eb..4d411b002c 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -66,10 +66,10 @@ static int ett_nbap_UnsuccessfulOutcomeValue = -1; #include "packet-nbap-ett.c" /* Global variables */ -proto_tree *top_tree; -guint32 ProcedureCode; -guint32 ProtocolIE_ID; -guint32 ddMode; +static proto_tree *top_tree; +static guint32 ProcedureCode; +static guint32 ProtocolIE_ID; +static guint32 ddMode; #define BYTE_ALIGN_OFFSET(offset) \ if(offset&0x07){ \ diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index e32fb3593f..b52b12963f 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -70,10 +70,10 @@ static int ett_ranap; /* Global variables */ -proto_tree *top_tree; -guint type_of_message; -guint32 ProcedureCode; -guint32 ProtocolIE_ID; +static proto_tree *top_tree; +static guint type_of_message; +static guint32 ProcedureCode; +static guint32 ProtocolIE_ID; static int dissect_ranap_ies(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 6ca7a2b4f9..470c1cbf7e 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-ranap.c */ +/* ./packet-ranap.c */ /* ../../tools/asn2eth.py -X -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */ /* Input file: packet-ranap-template.c */ @@ -859,10 +859,10 @@ static gint ett_ranap_PrivateIE_Field = -1; /* Global variables */ -proto_tree *top_tree; -guint type_of_message; -guint32 ProcedureCode; -guint32 ProtocolIE_ID; +static proto_tree *top_tree; +static guint type_of_message; +static guint32 ProcedureCode; +static guint32 ProtocolIE_ID; static int dissect_ranap_ies(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); static int dissect_ranap_FirstValue_ies(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); |