From 359fc1cb5dbbcf32132c3e8ee6f881a23deff684 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Wed, 21 Mar 2012 14:42:35 +0100 Subject: Use the spice-common submodule This patch will replace the common/ directory with the spice-common project. It is for now a simple project subdirectory shared with spice-gtk, but the goal is to make it a proper library later on. With this change, the spice-server build is broken. The following commits fix the build, and have been seperated to ease the review. v2 - moves all the generated marshallers to spice-common library - don't attempt to fix windows VS build, which should somehow be splitted with spice-common (or built from tarball only to avoid generation tools/libs deps) v3 - uses libspice-common-client - fix a mutex.h inclusion reported by Alon --- server/main_channel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'server/main_channel.c') diff --git a/server/main_channel.c b/server/main_channel.c index dbac010a..7a2938c6 100644 --- a/server/main_channel.c +++ b/server/main_channel.c @@ -36,14 +36,15 @@ #include #include -#include "server/red_common.h" -#include "server/demarshallers.h" -#include "common/ring.h" +#include "common/generated_server_marshallers.h" #include "common/messages.h" +#include "common/ring.h" + +#include "demarshallers.h" #include "main_channel.h" -#include "reds.h" #include "red_channel.h" -#include "generated_marshallers.h" +#include "red_common.h" +#include "reds.h" #define ZERO_BUF_SIZE 4096 -- cgit