diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-06-28 12:45:07 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-06-28 12:45:07 +0200 |
| commit | b08b80d13ff8a6822364e792391473dc53913dca (patch) | |
| tree | be31ecfdbfd598c1954f30fd5273481562e81eb9 | |
| parent | 897e5633c2d4e0d8fe91986b6e030dd1436b8fa8 (diff) | |
| download | spice-b08b80d13ff8a6822364e792391473dc53913dca.tar.gz spice-b08b80d13ff8a6822364e792391473dc53913dca.tar.xz spice-b08b80d13ff8a6822364e792391473dc53913dca.zip | |
Fix build error due to member "SpiceMsgEmpty" same name as type
| -rw-r--r-- | client/marshallers.h | 4 | ||||
| -rw-r--r-- | python_modules/marshal.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/client/marshallers.h b/client/marshallers.h index 1e6be115..c913a28a 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 ef1a47c2..1eb36751 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() |