[Spice-commits] src/spice-channel-priv.h subprojects/spice-common

[GitLab Mirror]

 src/spice-channel-priv.h |    2 +-
 subprojects/spice-common |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bde8548e11cbc1cfb8143cbf142ae252d379dfe9
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Oct 15 12:04:40 2018 +0100

    Use new common demarshallers.h
    
    Avoids mismatching duplicate declarations causing potentially
    ABI incompatibilities.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/src/spice-channel-priv.h b/src/spice-channel-priv.h
index b431037..091c116 100644
--- a/src/spice-channel-priv.h
+++ b/src/spice-channel-priv.h
@@ -33,7 +33,7 @@
 #include "gio-coroutine.h"
 
 #include "common/client_marshallers.h"
-#include "common/client_demarshallers.h"
+#include "common/demarshallers.h"
 #include "common/ssl_verify.h"
 
 G_BEGIN_DECLS
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 7d16536..2060672 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 7d16536672a5f2a0f61c6b4279d45b509e957dfb
+Subproject commit 2060672e8126ed9086dac6b70a4b138c106084a8