[Spice-devel] [PATCH v2 2/2] Define and use new SPICE_MAGIC_CONST macro

Christophe Fergeau cfergeau at redhat.com
Wed Aug 12 03:12:02 PDT 2015


One more comment,

The controller code in spice-gtk expectes controller_prot.h to be
self-contained, so it needs a #include <macros.h> otherwise there are
compilation warnings and a link failure of a test program.

Diff to add the #include to all headers using the new macro would be:

diff --git a/spice/controller_prot.h b/spice/controller_prot.h
index a21bf57..91dbe6f 100644
--- a/spice/controller_prot.h
+++ b/spice/controller_prot.h
@@ -18,6 +18,7 @@
 #ifndef _H_CONTROLLER_PROT
 #define _H_CONTROLLER_PROT
 
+#include <spice/macros.h>
 #include <spice/types.h>
 #include <spice/start-packed.h>
 
diff --git a/spice/foreign_menu_prot.h b/spice/foreign_menu_prot.h
index 9dd882d..2ee2552 100644
--- a/spice/foreign_menu_prot.h
+++ b/spice/foreign_menu_prot.h
@@ -18,6 +18,7 @@
 #ifndef _H_FOREIGN_MENU_PROT
 #define _H_FOREIGN_MENU_PROT
 
+#include <spice/macros.h>
 #include <spice/types.h>
 #include <spice/start-packed.h>
 
diff --git a/spice/protocol.h b/spice/protocol.h
index 68f45c3..0c265ee 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -33,6 +33,7 @@
 
 #include <spice/types.h>
 #include <spice/enums.h>
+#include <spice/macros.h>
 #include <spice/start-packed.h>
 
 #define SPICE_MAGIC SPICE_MAGIC_CONST("REDQ")
diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index 30b608e..9e753c4 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -36,6 +36,7 @@
 #include <spice/barrier.h>
 #include <spice/ipc_ring.h>
 #include <spice/enums.h>
+#include <spice/macros.h>
 
 #include <spice/start-packed.h>
 
diff --git a/spice/stats.h b/spice/stats.h
index 93326b5..46bbfed 100644
--- a/spice/stats.h
+++ b/spice/stats.h
@@ -31,6 +31,7 @@
 #ifndef _H_SPICE_STATS
 #define _H_SPICE_STATS
 
+#include <spice/macros.h>
 #include <spice/types.h>
 
 #define SPICE_STAT_SHM_NAME "/spice.%u"
diff --git a/spice/vdi_dev.h b/spice/vdi_dev.h
index 07c3697..a27f395 100644
--- a/spice/vdi_dev.h
+++ b/spice/vdi_dev.h
@@ -34,6 +34,7 @@
 #include <spice/types.h>
 #include <spice/barrier.h>
 #include <spice/ipc_ring.h>
+#include <spice/macros.h>
 
 #include <spice/start-packed.h>
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150812/53393d95/attachment.sig>


More information about the Spice-devel mailing list