osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid a conflict in global symbols by declaring some variables static. 

svn path=/trunk/; revision=16310
This commit is contained in:
Luis Ontanon 2005-10-25 18:38:47 +00:00
parent 7ca1457f35
commit 8c28eb9648
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asn1/nbap/packet-nbap-template.c
View File

@ -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){ \

8
asn1/ranap/packet-ranap-template.c
View File

@ -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);

10
epan/dissectors/packet-ranap.c
View File

@ -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);