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/canvas.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/canvas.h')
| -rw-r--r-- | client/canvas.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/client/canvas.h b/client/canvas.h index 51f28003..cd6a89b9 100644 --- a/client/canvas.h +++ b/client/canvas.h @@ -19,18 +19,20 @@ #ifndef _H_CANVAS #define _H_CANVAS +#include <map> + +#include "common/region.h" +#include "common/messages.h" +#include "common/canvas_utils.h" + #include "common.h" #include "debug.h" -#include "region.h" -#include "messages.h" #include "cache.hpp" #include "shared_cache.hpp" -#include "canvas_utils.h" #include "glz_decoded_image.h" #include "glz_decoder.h" #include "jpeg_decoder.h" #include "zlib_decoder.h" -#include <map> enum CanvasType { CANVAS_TYPE_INVALID, |