[Spice-commits] 2 commits - configure.ac server/reds.c

[Frediano Ziglio]

 configure.ac  |    3 +++
 server/reds.c |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit fe1b819a970d582aaaacbcc4e6702e40305b5eaa
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Fri Jan 13 09:14:35 2017 +0100

    Include compat header for g_clear_pointer
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/reds.c b/server/reds.c
index e061e4d..29485a8 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -75,6 +75,7 @@
 #include "red-channel-client.h"
 #include "main-channel-client.h"
 #include "red-client.h"
+#include "glib-compat.h"
 
 #define REDS_MAX_STAT_NODES 100
 
commit c1103b76fa9294e1e905f1f20e357b71666db530
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Fri Jan 13 14:16:49 2017 +0100

    build-sys: Warn on usage of unavailable glib functions
    
    Warnings are printed when glib2 >= 2.32 is present
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/configure.ac b/configure.ac
index a78b4ec..50135b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,10 @@ PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= $SPICE_PROTOCOL_MIN_VER])
 AC_SUBST([SPICE_PROTOCOL_MIN_VER])
 
 GLIB2_REQUIRED=2.28
+GLIB2_ENCODED_VERSION="GLIB_VERSION_2_28"
 PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= $GLIB2_REQUIRED gio-2.0 >= $GLIB2_REQUIRED])
+GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB2_ENCODED_VERSION \
+  -DGLIB_VERSION_MAX_ALLOWED=$GLIB2_ENCODED_VERSION"
 AS_VAR_APPEND([SPICE_REQUIRES], [" glib-2.0 >= $GLIB2_REQUIRED gio-2.0 >= $GLIB2_REQUIRED"])
 
 PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0 >= $GLIB2_REQUIRED])