diff options
-rw-r--r-- | config.nmake | 3 | ||||
-rw-r--r-- | epan/dtd_grammar.lemon | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/config.nmake b/config.nmake index e83010d955..47724b8009 100644 --- a/config.nmake +++ b/config.nmake @@ -1017,7 +1017,8 @@ RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO # GLib GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \ - /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include + /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include \ + -DG_DISABLE_DEPRECATED GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \ $(GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ $(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon index 5a2529e1ab..98d9678a5d 100644 --- a/epan/dtd_grammar.lemon +++ b/epan/dtd_grammar.lemon @@ -99,7 +99,7 @@ doctype ::= TAG_START DOCTYPE_KW NAME(Name) OPEN_BRACKET dtd_parts CLOSE_BRACKET bd->proto_root = Name->text; - g_strdown(bd->proto_name); + g_ascii_strdown(bd->proto_name, -1); for( i = 0; i< bd->elements->len; i++) { dtd_named_list_t* el = g_ptr_array_index(bd->elements,i); @@ -123,7 +123,7 @@ dtd_parts ::= attlist(Attlist). { g_ptr_array_add(bd->attributes,Attlist); } %type attlist { dtd_named_list_t* } attlist(A) ::= TAG_START ATTLIST_KW NAME(B) attrib_list(TheList) TAG_STOP. { - g_strdown(B->text); + g_ascii_strdown(B->text, -1); A = dtd_named_list_new(B->text,TheList); g_free(B->location); g_free(B); @@ -131,7 +131,7 @@ attlist(A) ::= TAG_START ATTLIST_KW NAME(B) attrib_list(TheList) TAG_STOP. { %type element { dtd_named_list_t* } element(A) ::= TAG_START ELEMENT_KW NAME(B) sub_elements(C) TAG_STOP. { - g_strdown(B->text); + g_ascii_strdown(B->text, -1); A = dtd_named_list_new(B->text,C); g_free(B->location); g_free(B); @@ -144,7 +144,7 @@ attrib_list(A) ::= attrib(B). { A = g_ptr_array_new(); g_ptr_array_add(A,B); } %type attrib { gchar* } attrib(A) ::= NAME(B) att_type att_default. { A = B->text; - g_strdown(A); + g_ascii_strdown(A, -1); g_free(B->location); g_free(B); } @@ -190,28 +190,28 @@ element_list(A) ::= element_list(B) PIPE sub_elements(C). { A = g_ptr_array_jo %type element_child { gchar* } element_child(A) ::= NAME(B). { A = B->text; - g_strdown(A); + g_ascii_strdown(A, -1); g_free(B->location); g_free(B); } element_child(A) ::= NAME(B) STAR. { A = B->text; - g_strdown(A); + g_ascii_strdown(A, -1); g_free(B->location); g_free(B); } element_child(A) ::= NAME(B) QUESTION. { A = B->text; - g_strdown(A); + g_ascii_strdown(A, -1); g_free(B->location); g_free(B); } element_child(A) ::= NAME(B) PLUS. { A = B->text; - g_strdown(A); + g_ascii_strdown(A, -1); g_free(B->location); g_free(B); } |