[Spice-commits] client/marshallers.h python_modules/marshal.py

[Alexander Larsson]

 client/marshallers.h      |    4 ++--
 python_modules/marshal.py |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b08b80d13ff8a6822364e792391473dc53913dca
Author: Alexander Larsson <alexl at redhat.com>
Date:   Mon Jun 28 12:45:07 2010 +0200

    Fix build error due to member "SpiceMsgEmpty" same name as type

diff --git a/client/marshallers.h b/client/marshallers.h
index 1e6be11..c913a28 100644
--- a/client/marshallers.h
+++ b/client/marshallers.h
@@ -24,8 +24,8 @@
 #include <messages.h>
 
 typedef struct {
-    void (*SpiceMsgEmpty)(SpiceMarshaller *m, SpiceMsgEmpty *msg);
-    void (*SpiceMsgData)(SpiceMarshaller *m, SpiceMsgData *msg);
+    void (*msg_SpiceMsgEmpty)(SpiceMarshaller *m, SpiceMsgEmpty *msg);
+    void (*msg_SpiceMsgData)(SpiceMarshaller *m, SpiceMsgData *msg);
     void (*msgc_ack_sync)(SpiceMarshaller *m, SpiceMsgcAckSync *msg);
     void (*msgc_pong)(SpiceMarshaller *m, SpiceMsgPing *msg);
     void (*msgc_disconnecting)(SpiceMarshaller *m, SpiceMsgDisconnect *msg);
diff --git a/python_modules/marshal.py b/python_modules/marshal.py
index ef1a47c..1eb3675 100644
--- a/python_modules/marshal.py
+++ b/python_modules/marshal.py
@@ -369,6 +369,8 @@ def write_protocol_marshaller(writer, proto, is_server, private_marshallers):
         writer.writeln("static SpiceMessageMarshallers marshallers = {NULL};").newline()
         for f in sorted(functions.keys()):
             member = f[len("spice_marshall_"):]
+            if not member.startswith("msg"):
+                member = "msg_" + member
             writer.assign("marshallers.%s" % member, f)
 
         writer.newline()