diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-02-23 06:28:34 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-02-23 06:28:34 +0000 |
| commit | f12969a81fce05ea8850e4096eb288d463057295 (patch) | |
| tree | a0f85467ff0666a668818cc514340366680e4237 /asn1 | |
| parent | 8a76942ba20ed01373035a20a7b4c27757fe4888 (diff) | |
Try to fix compilation with MSVC.
Please review.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31962 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ldap/ldap.cnf | 6 | ||||
| -rw-r--r-- | asn1/ldap/packet-ldap-template.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index ba25509096..3dd564d1b4 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -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; diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 741dc3dc1f..f7843d9a97 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -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; |