diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-07-11 20:32:19 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-07-11 20:32:19 +0000 |
| commit | 49b92440deaabb43114479e5b0e6af2c481ca8ac (patch) | |
| tree | 011c39768a3be7d7d1f63d9d48d1b6e96383fdf0 /epan/ftypes/ftype-pcre.c | |
| parent | 1f923105f8a5c2c7bf82f1187984600ba14ef993 (diff) | |
More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.
svn path=/trunk/; revision=37978
Diffstat (limited to 'epan/ftypes/ftype-pcre.c')
| -rw-r--r-- | epan/ftypes/ftype-pcre.c | 52 |
1 files changed, 3 insertions, 49 deletions
diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c index 4201dc75c4..c94f541d26 100644 --- a/epan/ftypes/ftype-pcre.c +++ b/epan/ftypes/ftype-pcre.c @@ -39,7 +39,7 @@ #include <pcre.h> -/* Create a pcre_tuple_t object based on the given string pattern */ +/* Create a pcre_tuple_t object based on the given string pattern */ static pcre_tuple_t * pcre_tuple_new(const char *value) { @@ -216,7 +216,7 @@ ftype_register_pcre(void) ftype_register(FT_PCRE, &pcre_type); } -#elif GLIB_CHECK_VERSION(2,14,0) /* No HAVE_LIBPCRE. Try falling back to GRegex. */ +#else /* No HAVE_LIBPCRE. Try falling back to GRegex. */ #include <glib.h> @@ -351,53 +351,8 @@ ftype_register_pcre(void) ftype_register(FT_PCRE, &pcre_type); } -#else /* No HAVE_LIBPCRE or GRegex */ - -void -ftype_register_pcre(void) -{ - static ftype_t pcre_type = { - FT_PCRE, /* ftype */ - "FT_PCRE", /* name */ - "Compiled Perl-Compatible Regular Expression object", /* pretty_name */ - 0, /* wire_size */ - NULL, /* new_value */ - NULL, /* free_value */ - NULL, /* val_from_unparsed */ - NULL, /* val_from_string */ - NULL, /* val_to_string_repr */ - NULL, /* len_string_repr */ - - NULL, /* set_value */ - NULL, /* set_value_uinteger */ - NULL, /* set_value_sinteger */ - NULL, /* set_value_integer64 */ - NULL, /* set_value_floating */ - - NULL, /* get_value */ - NULL, /* get_value_uinteger */ - NULL, /* get_value_sinteger */ - NULL, /* get_value_integer64 */ - NULL, /* get_value_floating */ - - NULL, /* cmp_eq */ - NULL, /* cmp_ne */ - NULL, /* cmp_gt */ - NULL, /* cmp_ge */ - NULL, /* cmp_lt */ - NULL, /* cmp_le */ - NULL, /* cmp_bitwise_and */ - NULL, /* cmp_contains */ - NULL, /* cmp_matches */ - - NULL, /* len */ - NULL, /* slice */ - }; - ftype_register(FT_PCRE, &pcre_type); -} - #endif /* HAVE_LIBPCRE */ - + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -410,4 +365,3 @@ ftype_register_pcre(void) * vi: set shiftwidth=4 tabstop=4 noexpandtab * :indentSize=4:tabSize=4:noTabs=false: */ - |