summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-06-18 21:10:25 +0200
committerAlexander Larsson <alexl@redhat.com>2010-06-18 21:10:25 +0200
commitae4436215cb113a02eac73c6afd368166090967c (patch)
tree8d144ec5908ada3b363dd4b24a6143f45cdd861b /common
parent0f2e0378348f87c8e408a1db59783e1d9c00d68d (diff)
downloadspice-ae4436215cb113a02eac73c6afd368166090967c.tar.gz
spice-ae4436215cb113a02eac73c6afd368166090967c.tar.xz
spice-ae4436215cb113a02eac73c6afd368166090967c.zip
Make generated marshallers build on win32
Diffstat (limited to 'common')
-rw-r--r--common/marshaller.c2
-rw-r--r--common/marshaller.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/common/marshaller.c b/common/marshaller.c
index 13385e59..5844b897 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 3b159aa9..a60e97b4 100644
--- a/common/marshaller.h
+++ b/common/marshaller.h
@@ -20,7 +20,9 @@
#define _H_MARSHALLER
#include <spice/types.h>
+#ifndef WIN32
#include <sys/uio.h>
+#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);