diff options
author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-07 18:35:36 +0000 |
---|---|---|
committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-07 18:35:36 +0000 |
commit | f243c18d0afea73ac5ce95f43fb2d5f5e34a4a93 (patch) | |
tree | e4b56960256588b3dcbdbbc4e32751210b3a09bc /plugins | |
parent | 2c1dea27da0f6c6ce15647854e92e7ad4372a8c3 (diff) |
mate_grammar.lemon:
- Fix a bug my previous patch introduced.
mate/:
- Unset G_DISABLE_DEPRECATED for the mate files.
CMakeLists.txt
configure.in:
- Build with -DG_DISABLE_DEPRECATED so further usage of
deprecated glib functions will be detected.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38393 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mate/mate.h | 2 | ||||
-rw-r--r-- | plugins/mate/mate_grammar.lemon | 2 | ||||
-rw-r--r-- | plugins/mate/mate_parser.l | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h index 4d062808ad..5f38953fc9 100644 --- a/plugins/mate/mate.h +++ b/plugins/mate/mate.h @@ -32,6 +32,8 @@ # include "config.h" #endif +#undef G_DISABLE_DEPRECATED + #ifndef ENABLE_STATIC #include "moduleinfo.h" #include <gmodule.h> diff --git a/plugins/mate/mate_grammar.lemon b/plugins/mate/mate_grammar.lemon index f6236ba766..a783740c6e 100644 --- a/plugins/mate/mate_grammar.lemon +++ b/plugins/mate/mate_grammar.lemon @@ -132,7 +132,7 @@ static gchar* recolonize(mate_config* mc, gchar* s) { vec = g_strsplit(s,":",0); for (i = 0; vec[i]; i++) { - g_ascii_strdown(vec[i]); + g_ascii_strdown(vec[i], -1); v = 0; switch ( strlen(vec[i]) ) { diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l index 4fb4b509e9..792e6b7fa5 100644 --- a/plugins/mate/mate_parser.l +++ b/plugins/mate/mate_parser.l @@ -42,12 +42,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <wsutil/file_util.h> - #include "mate.h" #include "mate_grammar.h" #include "mate_parser_lex.h" +#include <wsutil/file_util.h> + #ifdef _WIN32 /* disable Windows VC compiler warning "signed/unsigned mismatch" associated */ /* with YY_INPUT code generated by flex versions such as 2.5.35. */ |