osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Try to fix compilation with MSVC. 

Please review.

svn path=/trunk/; revision=31962
This commit is contained in:
Anders Broman 2010-02-23 06:28:34 +00:00
parent b395a98305
commit c1defb60a7
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asn1/ldap/ldap.cnf
View File

@ -563,7 +563,7 @@ ldap_conv_info_t *ldap_info;
#.FN_BODY Filter/and
proto_tree *tr=NULL;
proto_item *it=NULL;
char *old_and_filter_string=and_filter_string;
const char *old_and_filter_string=and_filter_string;
and_filter_string=NULL;
if(tree){
@ -591,7 +591,7 @@ ldap_conv_info_t *ldap_info;
#.FN_BODY Filter/or
proto_tree *tr=NULL;
proto_item *it=NULL;
char *old_or_filter_string=or_filter_string;
const char *old_or_filter_string=or_filter_string;
or_filter_string=NULL;
if(tree){
@ -652,7 +652,7 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v
#.FN_BODY SubstringFilter
proto_tree *tr=NULL;
proto_item *it=NULL;
char *old_substring_value=substring_value;
const char *old_substring_value=substring_value;
substring_value=NULL;
substring_item_init=NULL;

6
asn1/ldap/packet-ldap-template.c
View File

@ -543,9 +543,9 @@ finished:
/* This string contains the last Filter item that was decoded */
static const char *Filter_string=NULL;
static char *and_filter_string=NULL;
static char *or_filter_string=NULL;
static char *substring_value=NULL;
static const char *and_filter_string=NULL;
static const char *or_filter_string=NULL;
static const char *substring_value=NULL;
static const char *substring_item_init=NULL;
static const char *substring_item_any=NULL;
static const char *substring_item_final=NULL;

12
epan/dissectors/packet-ldap.c
View File

@ -760,9 +760,9 @@ finished:
/* This string contains the last Filter item that was decoded */
static const char *Filter_string=NULL;
static char *and_filter_string=NULL;
static char *or_filter_string=NULL;
static char *substring_value=NULL;
static const char *and_filter_string=NULL;
static const char *or_filter_string=NULL;
static const char *substring_value=NULL;
static const char *substring_item_init=NULL;
static const char *substring_item_any=NULL;
static const char *substring_item_final=NULL;
@ -1689,7 +1689,7 @@ dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
#line 564 "ldap.cnf"
proto_tree *tr=NULL;
proto_item *it=NULL;
char *old_and_filter_string=and_filter_string;
const char *old_and_filter_string=and_filter_string;
and_filter_string=NULL;
if(tree){
@ -1741,7 +1741,7 @@ dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
#line 592 "ldap.cnf"
proto_tree *tr=NULL;
proto_item *it=NULL;
char *old_or_filter_string=or_filter_string;
const char *old_or_filter_string=or_filter_string;
or_filter_string=NULL;
if(tree){
@ -1881,7 +1881,7 @@ dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
#line 653 "ldap.cnf"
proto_tree *tr=NULL;
proto_item *it=NULL;
char *old_substring_value=substring_value;
const char *old_substring_value=substring_value;
substring_value=NULL;
substring_item_init=NULL;