diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-21 14:42:35 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-25 18:59:10 +0200 |
| commit | 359fc1cb5dbbcf32132c3e8ee6f881a23deff684 (patch) | |
| tree | 3ae7cc1c8b4d0449d50a13cb9640a6ef75f51f11 /server/reds.c | |
| parent | 4df135c858d7dfb1aa0ae5d3cb17d786410d1544 (diff) | |
| download | spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.gz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.xz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.zip | |
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
Diffstat (limited to 'server/reds.c')
| -rw-r--r-- | server/reds.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/reds.c b/server/reds.c index 30e3ac04..cf493dde 100644 --- a/server/reds.c +++ b/server/reds.c @@ -47,26 +47,26 @@ #include <sasl/sasl.h> #endif +#include <spice/protocol.h> +#include <spice/vd_agent.h> +#include <spice/stats.h> + +#include "common/generated_server_marshallers.h" +#include "common/ring.h" + #include "spice.h" #include "spice-experimental.h" #include "reds.h" -#include <spice/protocol.h> -#include <spice/vd_agent.h> #include "agent-msg-filter.h" - #include "inputs_channel.h" #include "main_channel.h" #include "red_common.h" #include "red_dispatcher.h" #include "main_dispatcher.h" #include "snd_worker.h" -#include <spice/stats.h> #include "stat.h" -#include "ring.h" #include "demarshallers.h" -#include "marshaller.h" -#include "generated_marshallers.h" -#include "server/char_device.h" +#include "char_device.h" #ifdef USE_TUNNEL #include "red_tunnel_worker.h" #endif |