qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] glib: add compatibility interface for g_strcmp0()


From: arei.gonglei
Subject: [Qemu-devel] [PATCH] glib: add compatibility interface for g_strcmp0()
Date: Thu, 16 Oct 2014 18:59:37 +0800

From: Gonglei <address@hidden>

This patch fixes compilation errors when building against glib < 2.16.0
due to the missing g_strcmp0() function.

Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Gonglei <address@hidden>
---
 Because g_strcmp0() was called in three places, I provide
 a back-compat implementation. 
---
 include/glib-compat.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/glib-compat.h b/include/glib-compat.h
index e29bf69..f0615c9 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -45,6 +45,23 @@ static inline gint64 g_get_monotonic_time(void)
 }
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 16, 0)
+static inline int g_strcmp0(const char *str1, const char *str2)
+{
+    int result;
+
+    if (!str1) {
+        result = -(str1 != str2);
+    } else if (!str2) {
+        result = (str1 != str2);
+    } else {
+        result = strcmp(str1, str2);
+    }
+
+    return result;
+}
+#endif
+
 #ifdef _WIN32
 /*
  * g_poll has a problem on Windows when using
-- 
1.7.12.4





reply via email to

[Prev in Thread] Current Thread [Next in Thread]