[Spice-devel] [PATCH spice-server] Fix minor incompatibilities with RHEL6

[Christophe Fergeau]

On Thu, Mar 30, 2017 at 10:30:31AM +0100, Frediano Ziglio wrote:
> Include missing pthread header.
> Avoid not declared functions in test-glic-compat.c including proper
> header.

"undeclared functions" ? "test-glib-compat.c" "by including the
proper/correct header"

Acked-by: Christophe Fergeau <cfergeau at redhat.com>

> Define missing g_assert_true and g_assert_false.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  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(-)
> 
> diff --git a/server/red-record-qxl.c b/server/red-record-qxl.c
> index 21ff964..f65b0bf 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 9b47dc6..0b2008b 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 e50d093..a364012 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_
> -- 
> 2.9.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170330/570948bd/attachment.sig>