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-string.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-string.c')
| -rw-r--r-- | epan/ftypes/ftype-string.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 11ccdf38a7..24ec502d9d 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -28,14 +28,10 @@ #include <ftypes-int.h> #include <string.h> -#if defined(HAVE_LIBPCRE) || GLIB_CHECK_VERSION(2,14,0) -# ifdef HAVE_LIBPCRE +#ifdef HAVE_LIBPCRE # include <pcre.h> -# endif -#define CMP_MATCHES cmp_matches -#else -#define CMP_MATCHES NULL #endif +#define CMP_MATCHES cmp_matches #include <ctype.h> @@ -288,7 +284,7 @@ cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) } return FALSE; } -#elif GLIB_CHECK_VERSION(2,14,0) /* GRegex */ +#else /* GRegex */ static gboolean cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b) { |