aboutsummaryrefslogtreecommitdiffstats
path: root/epan/strutil.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-05-20 17:27:05 +0000
committerGerald Combs <gerald@wireshark.org>2013-05-20 17:27:05 +0000
commitc0702583d310d1bba45066446cb5b40c4cdf410c (patch)
tree33566b110a2ae7fd28f3a0ef8a40f3d6a3a98d8d /epan/strutil.c
parenta02e821fe6d6c59387fe235bde6fd2e00f190566 (diff)
Make the minimum supported GLib version 2.16.
svn path=/trunk/; revision=49444
Diffstat (limited to 'epan/strutil.c')
-rw-r--r--epan/strutil.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/epan/strutil.c b/epan/strutil.c
index 85b270eb27..d7ad038976 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -1077,35 +1077,6 @@ gchar *string_replace(const gchar* str, const gchar *old_val, const gchar *new_v
return new_str;
}
-
-/**
- * g_strcmp0 appears first in GLIB 2.16, define it locally for earlier versions.
- * Copied from gtestutils.c in glib
- * g_strcmp0:
- * @str1: (allow-none): a C string or %NULL
- * @str2: (allow-none): another C string or %NULL
- *
- * Compares @str1 and @str2 like strcmp(). Handles %NULL
- * gracefully by sorting it before non-%NULL strings.
- * Comparing two %NULL pointers returns 0.
- *
- * Returns: -1, 0 or 1, if @str1 is <, == or > than @str2.
- *
- * Since: 2.16
- */
-#if !GLIB_CHECK_VERSION(2,16,0)
-int
-g_strcmp0 (const char *str1,
- const char *str2)
-{
- if (!str1)
- return -(str1 != str2);
- if (!str2)
- return str1 != str2;
- return strcmp (str1, str2);
-}
-#endif /* GLIB_CHECK_VERSION(2,16,0) */
-
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*