mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 10:56:56 +00:00
286cd8378c
Upstream bug: https://bugzilla.redhat.com/show_bug.cgi?id=1293060 This patch is based on the one attached to that bug report, but instead of patching the .x files (parsing of which apparently fails as well) it modifies the pre-generated .c files directly. This ought to fix #12139.
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c
|
|
--- libvirt-1.3.0.orig/src/admin/admin_protocol.c 2015-12-02 16:17:07.000000000 +0100
|
|
+++ libvirt-1.3.0/src/admin/admin_protocol.c 2016-01-04 17:57:10.043412857 +0100
|
|
@@ -6,6 +6,25 @@
|
|
|
|
#include "admin_protocol.h"
|
|
|
|
+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
|
|
+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
|
|
+ */
|
|
+#ifdef HAVE_XDR_U_INT64_T
|
|
+# define xdr_uint64_t xdr_u_int64_t
|
|
+#endif
|
|
+#ifndef IXDR_PUT_INT32
|
|
+# define IXDR_PUT_INT32 IXDR_PUT_LONG
|
|
+#endif
|
|
+#ifndef IXDR_GET_INT32
|
|
+# define IXDR_GET_INT32 IXDR_GET_LONG
|
|
+#endif
|
|
+#ifndef IXDR_PUT_U_INT32
|
|
+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
|
|
+#endif
|
|
+#ifndef IXDR_GET_U_INT32
|
|
+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
|
|
+#endif
|
|
+
|
|
bool_t
|
|
xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp)
|
|
{
|
|
diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c
|
|
--- libvirt-1.3.0.orig/src/logging/log_protocol.c 2015-12-08 13:07:35.000000000 +0100
|
|
+++ libvirt-1.3.0/src/logging/log_protocol.c 2016-01-04 17:56:50.673463563 +0100
|
|
@@ -7,6 +7,25 @@
|
|
#include "log_protocol.h"
|
|
#include "internal.h"
|
|
|
|
+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
|
|
+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
|
|
+ */
|
|
+#ifdef HAVE_XDR_U_INT64_T
|
|
+# define xdr_uint64_t xdr_u_int64_t
|
|
+#endif
|
|
+#ifndef IXDR_PUT_INT32
|
|
+# define IXDR_PUT_INT32 IXDR_PUT_LONG
|
|
+#endif
|
|
+#ifndef IXDR_GET_INT32
|
|
+# define IXDR_GET_INT32 IXDR_GET_LONG
|
|
+#endif
|
|
+#ifndef IXDR_PUT_U_INT32
|
|
+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
|
|
+#endif
|
|
+#ifndef IXDR_GET_U_INT32
|
|
+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
|
|
+#endif
|
|
+
|
|
bool_t
|
|
xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp)
|
|
{
|