Add g_strcmp0 to compat, it's Glib 2.16

diff --git a/midori/compat.c b/midori/compat.c
index 7a871ad18caedcd4beaf96b8d52d07e371c4f940..cd6243d55b221a6a5c611322cb95a4cad5b276b7 100644 (file)
--- a/midori/compat.c
+++ b/midori/compat.c
@@ -11,6 +11,24 @@
 
 #include "compat.h"
 
+#if !GLIB_CHECK_VERSION(2, 16, 0)
+
+/* Glib string function
+   Copyright (C) 2008 Tim Janik <timj@imendio.com>
+   Copied from Glib 2.16, coding style adjusted */
+gint
+g_strcmp0 (const gchar* string1,
+           const gchar* string2)
+{
+    if (!string1)
+        return -(str1 != str2);
+    if (!string2)
+        return string1 != string2;
+    return strcmp (string1, string2);
+}
+
+#endif
+
 #if !GTK_CHECK_VERSION(2, 14, 0)
 
 #if HAVE_GIO

diff --git a/midori/compat.h b/midori/compat.h
index bd03cf97598d6bae4d732b338d28adf209734738..49cb3e60512ac0c9b6dbeed57361e31d3980f401 100644 (file)
--- a/midori/compat.h
+++ b/midori/compat.h
@@ -23,6 +23,14 @@
 
 G_BEGIN_DECLS
 
+#if !GLIB_CHECK_VERSION(2, 16, 0)
+
+gint
+g_strcmp0 (const gchar* string1,
+           const gchar* string2);
+
+#endif
+
 #if !GTK_CHECK_VERSION(2, 14, 0)
 
 #if HAVE_GIO