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 /client/red_peer.h | |
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 'client/red_peer.h')
-rw-r--r-- | client/red_peer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/red_peer.h b/client/red_peer.h index 5e2b2b91..b0faa9d7 100644 --- a/client/red_peer.h +++ b/client/red_peer.h @@ -21,14 +21,15 @@ #include <openssl/ssl.h> #include <openssl/err.h> -#include "common.h" #include <spice/protocol.h> +#include "common/marshaller.h" +#include "common/ssl_verify.h" + +#include "common.h" #include "process_loop.h" #include "threads.h" #include "platform_utils.h" -#include "marshaller.h" #include "debug.h" -#include "ssl_verify.h" class RedPeer: protected EventSources::Socket { public: |