diff --git a/common/marshaller.c b/common/marshaller.c index 13385e5..5844b89 100644 --- a/common/marshaller.c +++ b/common/marshaller.c @@ -491,6 +491,7 @@ void spice_marshaller_flush(SpiceMarshaller *m) } } +#ifndef WIN32 int spice_marshaller_fill_iovec(SpiceMarshaller *m, struct iovec *vec, int n_vec, size_t skip_bytes) { @@ -522,6 +523,7 @@ int spice_marshaller_fill_iovec(SpiceMarshaller *m, struct iovec *vec, return v; } +#endif void spice_marshaller_add_uint64(SpiceMarshaller *m, uint64_t v) { diff --git a/common/marshaller.h b/common/marshaller.h index 3b159aa..a60e97b 100644 --- a/common/marshaller.h +++ b/common/marshaller.h @@ -20,7 +20,9 @@ #define _H_MARSHALLER #include +#ifndef WIN32 #include +#endif typedef struct SpiceMarshaller SpiceMarshaller; typedef void (*spice_marshaller_item_free_func)(uint8_t *data, void *opaque); @@ -44,8 +46,10 @@ size_t spice_marshaller_get_size(SpiceMarshaller *m); size_t spice_marshaller_get_total_size(SpiceMarshaller *m); SpiceMarshaller *spice_marshaller_get_submarshaller(SpiceMarshaller *m); SpiceMarshaller *spice_marshaller_get_ptr_submarshaller(SpiceMarshaller *m, int is_64bit); +#ifndef WIN32 int spice_marshaller_fill_iovec(SpiceMarshaller *m, struct iovec *vec, int n_vec, size_t skip_bytes); +#endif void spice_marshaller_add_uint64(SpiceMarshaller *m, uint64_t v); void spice_marshaller_add_int64(SpiceMarshaller *m, int64_t v); void spice_marshaller_add_uint32(SpiceMarshaller *m, uint32_t v); diff --git a/python_modules/marshal.py b/python_modules/marshal.py index 23b029a..4cbf942 100644 --- a/python_modules/marshal.py +++ b/python_modules/marshal.py @@ -18,6 +18,7 @@ def write_includes(writer): writer.newline() writer.writeln("#ifdef _MSC_VER") writer.writeln("#pragma warning(disable:4101)") + writer.writeln("#pragma warning(disable:4018)") writer.writeln("#endif") writer.newline()