diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-12-13 14:39:19 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-12-13 14:39:19 +0000 |
| commit | 099efcf5eb7252a8bc87197a652dd5f2f5e0cbd5 (patch) | |
| tree | 1e45b133bdff12b4b7c51098bab341486c636bf3 /epan/value_string.c | |
| parent | aa08f7bab1598e3265532e6b5c2fb2e4c1c29bf6 (diff) | |
| download | wireshark-099efcf5eb7252a8bc87197a652dd5f2f5e0cbd5.tar.gz wireshark-099efcf5eb7252a8bc87197a652dd5f2f5e0cbd5.tar.bz2 wireshark-099efcf5eb7252a8bc87197a652dd5f2f5e0cbd5.zip | |
Value_string.h: Minor changes to comment text
value_string.c: value_string_ext_validate() always fails on Windows
when called from a different DLL (i.e. a plugin).
So: Add #ifndef _WIN32 around the offending code.
svn path=/trunk/; revision=54047
Diffstat (limited to 'epan/value_string.c')
| -rw-r--r-- | epan/value_string.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/value_string.c b/epan/value_string.c index 9938adecec..c384f54344 100644 --- a/epan/value_string.c +++ b/epan/value_string.c @@ -605,12 +605,14 @@ value_string_ext_validate(const value_string_ext *vse) { if (vse == NULL) return FALSE; - if ((vse->_vs_match2 == _try_val_to_str_ext_init) || - (vse->_vs_match2 == _try_val_to_str_linear) || - (vse->_vs_match2 == _try_val_to_str_bsearch) || - (vse->_vs_match2 == _try_val_to_str_index)) - return TRUE; - return FALSE; +#ifndef _WIN32 /* doesn't work on Windows for refs from another DLL ?? */ + if ((vse->_vs_match2 != _try_val_to_str_ext_init) && + (vse->_vs_match2 != _try_val_to_str_linear) && + (vse->_vs_match2 != _try_val_to_str_bsearch) && + (vse->_vs_match2 != _try_val_to_str_index)) + return FALSE; +#endif + return TRUE; } const gchar * |