diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-06-18 14:05:59 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-06-18 20:27:32 +0200 |
| commit | 4c1094acce7a062d28fc2c7c45b2e0357105c7bf (patch) | |
| tree | 78a2519767d4e2a5f6b7512ec3a2a90ed0b17a77 /client | |
| parent | 185a320c9be85d07586e5d475c991770853fec77 (diff) | |
| download | spice-4c1094acce7a062d28fc2c7c45b2e0357105c7bf.tar.gz spice-4c1094acce7a062d28fc2c7c45b2e0357105c7bf.tar.xz spice-4c1094acce7a062d28fc2c7c45b2e0357105c7bf.zip | |
Make all message structs internal to spice
We move all message structs from spice-protocol to spice as
we want to be able to change these as needed internally. The
on-network format is no longer defined by these structures anyway,
but rather by the spice protocol description.
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 4 | ||||
| -rw-r--r-- | client/canvas.h | 2 | ||||
| -rw-r--r-- | client/cursor.h | 2 | ||||
| -rw-r--r-- | client/red_client.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index f1402036..86d7c3e3 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -6,11 +6,11 @@ DIST_SUBDIRS = x11 #windows spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp generated_marshallers.h generated_demarshallers.cpp: $(top_srcdir)/spice.proto - $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h $(top_srcdir)/spice.proto generated_demarshallers.cpp + $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h $(top_srcdir)/spice.proto generated_demarshallers.cpp STRUCTS= generated_marshallers.cpp: $(top_srcdir)/spice.proto - $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --client $(top_srcdir)/spice.proto generated_marshallers.cpp + $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --include messages.h --client $(top_srcdir)/spice.proto generated_marshallers.cpp generated_marshallers.h: $(top_srcdir)/spice.proto $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --client -H $(top_srcdir)/spice.proto generated_marshallers.h diff --git a/client/canvas.h b/client/canvas.h index c988a523..ff70e116 100644 --- a/client/canvas.h +++ b/client/canvas.h @@ -22,7 +22,7 @@ #include "common.h" #include "debug.h" #include "region.h" -#include <spice/protocol.h> +#include "messages.h" #include "cache.hpp" #include "shared_cache.hpp" #include "canvas_base.h" diff --git a/client/cursor.h b/client/cursor.h index a756543f..f5084cd9 100644 --- a/client/cursor.h +++ b/client/cursor.h @@ -19,7 +19,7 @@ #define _H_CURSOR_ #include "threads.h" -#include <spice/protocol.h> +#include "messages.h" #include "red_window_p.h" class CursorOpaque { diff --git a/client/red_client.h b/client/red_client.h index 51c1780f..1b81328a 100644 --- a/client/red_client.h +++ b/client/red_client.h @@ -27,7 +27,7 @@ #include "inputs_channel.h" #include "cursor_channel.h" #include "audio_channels.h" -#include <spice/protocol.h> +#include "messages.h" #include <spice/vd_agent.h> #include "process_loop.h" |