From 5f77ef69a195098baddfdc6d189f1b4a94587378 Mon Sep 17 00:00:00 2001 From: Gonglei Date: Thu, 16 Oct 2014 18:59:37 +0800 Subject: [PATCH] glib: add compatibility interface for g_strcmp0() This patch fixes compilation errors when building against glib < 2.16.0 due to the missing g_strcmp0() function. Suggested-by: Peter Maydell Signed-off-by: Gonglei Message-id: 1413457177-10132-1-git-send-email-arei.gonglei@huawei.com Signed-off-by: Peter Maydell --- include/glib-compat.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/glib-compat.h b/include/glib-compat.h index e29bf69849..f0615c99c2 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 -- 2.11.4.GIT