[Spice-commits] server/red-record-qxl.c server/tests

[Frediano Ziglio]

 server/red-record-qxl.c         |    2 ++
 server/tests/test-glib-compat.c |    2 +-
 server/tests/test-glib-compat.h |    7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7d86223e21e990efcf2397191a7692f04c38f0c0
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Mar 30 10:27:46 2017 +0100

    Fix minor incompatibilities with RHEL6
    
    Include missing pthread header.
    Avoid undeclared functions in test-glib-compat.c including
    proper/correct header.
    Define missing g_assert_true and g_assert_false.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/red-record-qxl.c b/server/red-record-qxl.c
index 21ff964f..f65b0bf1 100644
--- a/server/red-record-qxl.c
+++ b/server/red-record-qxl.c
@@ -20,7 +20,9 @@
 #endif
 
 #include <inttypes.h>
+#include <pthread.h>
 #include <glib.h>
+
 #include "red-common.h"
 #include "memslot.h"
 #include "red-parse-qxl.h"
diff --git a/server/tests/test-glib-compat.c b/server/tests/test-glib-compat.c
index 9b47dc67..0b2008b7 100644
--- a/server/tests/test-glib-compat.c
+++ b/server/tests/test-glib-compat.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#include "glib-compat.h"
+#include "test-glib-compat.h"
 
 #if !GLIB_CHECK_VERSION(2, 34, 0)
 
diff --git a/server/tests/test-glib-compat.h b/server/tests/test-glib-compat.h
index e50d0939..a364012f 100644
--- a/server/tests/test-glib-compat.h
+++ b/server/tests/test-glib-compat.h
@@ -39,4 +39,11 @@ void g_test_expect_message(const gchar *log_domain, GLogLevelFlags log_level,
 #define g_assert_null(ptr) g_assert((ptr) == NULL)
 #endif
 
+#ifndef g_assert_true
+#define g_assert_true g_assert
+#endif
+#ifndef g_assert_false
+#define g_assert_false(cond) g_assert(!(cond))
+#endif
+
 #endif // TEST_GLIB_COMPAT_H_