[libvirt] [PATCH] lxc_monitor_protocol: Redefine xdr_uint64_t if needed

[Martin Kletzander]

On Tue, Sep 23, 2014 at 10:51:01AM +0200, Michal Privoznik wrote:
>On some systems (using libtirpc instead of glibc's
>implementation), xdr_uint64_t exists rather under different name:
>xdr_u_int64_t. This makes compilation fail then:
>
>libvirt_lxc-lxc_monitor_protocol.o: In function `xdr_virLXCMonitorInitEventMsg':
>/usr/local/src/libvirt/libvirt-1.1.1/src/./lxc/lxc_monitor_protocol.c:31: undefined reference to `xdr_uint64_t'
>
>Therefore we rather mirror the d707c866 commit and redefine
>xdr_uint64_t if needed.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/lxc/lxc_monitor_protocol.x | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>

It'd be nice to have this globally somewhere, but I know that's not
the goal of this patch.  This is good for a build-breaker ;)

ACK for 1.2.9,

Martin

>diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x
>index 0926e26..3b66af5 100644
>--- a/src/lxc/lxc_monitor_protocol.x
>+++ b/src/lxc/lxc_monitor_protocol.x
>@@ -4,6 +4,25 @@
>  * the libvirt_lxc helper program.
>  */
>
>+/* 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
>+
> enum virLXCMonitorExitStatus {
>     VIR_LXC_MONITOR_EXIT_STATUS_ERROR,
>     VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN,
>--
>1.8.5.5
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140925/a9909378/attachment-0001.sig>