tjh.dev
1diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c
2--- libvirt-1.3.0.orig/src/admin/admin_protocol.c 2015-12-02 16:17:07.000000000 +0100
3+++ libvirt-1.3.0/src/admin/admin_protocol.c 2016-01-04 17:57:10.043412857 +0100
4@@ -6,6 +6,25 @@
5
6 #include "admin_protocol.h"
7
8+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
9+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
10+ */
11+#ifdef HAVE_XDR_U_INT64_T
12+# define xdr_uint64_t xdr_u_int64_t
13+#endif
14+#ifndef IXDR_PUT_INT32
15+# define IXDR_PUT_INT32 IXDR_PUT_LONG
16+#endif
17+#ifndef IXDR_GET_INT32
18+# define IXDR_GET_INT32 IXDR_GET_LONG
19+#endif
20+#ifndef IXDR_PUT_U_INT32
21+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
22+#endif
23+#ifndef IXDR_GET_U_INT32
24+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
25+#endif
26+
27 bool_t
28 xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp)
29 {
30diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c
31--- libvirt-1.3.0.orig/src/logging/log_protocol.c 2015-12-08 13:07:35.000000000 +0100
32+++ libvirt-1.3.0/src/logging/log_protocol.c 2016-01-04 17:56:50.673463563 +0100
33@@ -7,6 +7,25 @@
34 #include "log_protocol.h"
35 #include "internal.h"
36
37+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
38+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
39+ */
40+#ifdef HAVE_XDR_U_INT64_T
41+# define xdr_uint64_t xdr_u_int64_t
42+#endif
43+#ifndef IXDR_PUT_INT32
44+# define IXDR_PUT_INT32 IXDR_PUT_LONG
45+#endif
46+#ifndef IXDR_GET_INT32
47+# define IXDR_GET_INT32 IXDR_GET_LONG
48+#endif
49+#ifndef IXDR_PUT_U_INT32
50+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
51+#endif
52+#ifndef IXDR_GET_U_INT32
53+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
54+#endif
55+
56 bool_t
57 xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp)
58 {