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

[make-dissectors] g_ptr_array_new_full() is glib 2.30.0 which we do not 

require.

Add alternate code to fix the build for our minimum required version.

Change-Id: Ia0911c5a6be3af68330ac41a3336d7d47b87b7a9
Reviewed-on: https://code.wireshark.org/review/24535
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2017-11-22 17:22:52 +01:00 committed by Anders Broman
parent d790c524b4
commit fe76be0b5b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/make-dissectors.c
View File

@ -69,8 +69,15 @@ int main(int argc, char **argv)
GError *err = NULL;
guint i;
#if GLIB_CHECK_VERSION(2, 30, 0)
protos = g_ptr_array_new_full(ARRAY_RESERVED_SIZE, g_free);
handoffs = g_ptr_array_new_full(ARRAY_RESERVED_SIZE, g_free);
#else
protos = g_ptr_array_sized_new(ARRAY_RESERVED_SIZE);
g_ptr_array_set_free_func(protos, g_free);
handoffs = g_ptr_array_sized_new(ARRAY_RESERVED_SIZE);
g_ptr_array_set_free_func(handoffs, g_free);
#endif /* GLIB_CHECK_VERSION(2, 30, 0)*/
protos_regex = g_regex_new("void\\s+(proto_register_[[:alnum:]_]+)\\s*\\(\\s*void\\s*\\)\\s*{",
G_REGEX_OPTIMIZE, G_REGEX_MATCH_NOTEMPTY, &err);