From 461455ca7cab93af09445d135483f5705589cc0c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 22 Jun 2012 13:02:35 +0100
Subject: tests/xml: Fix compilation of test on RHEL 5 with old libvirt.

Old <libvirt.h> had a conflicting definition of virDomainGetXMLDesc:

fake_libvirt_xml.c:36: error: conflicting types for 'virDomainGetXMLDesc'
/usr/include/libvirt/libvirt.h:715: error: previous declaration of 'virDomainGetXMLDesc' was here

The difference is not material ('int' vs. 'unsigned int').

Avoid the error by not including <libvirt.h>.
---
 tests/xml/fake_libvirt_xml.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/xml/fake_libvirt_xml.c b/tests/xml/fake_libvirt_xml.c
index c44e5fc1..61065d3d 100644
--- a/tests/xml/fake_libvirt_xml.c
+++ b/tests/xml/fake_libvirt_xml.c
@@ -25,12 +25,19 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <libvirt/libvirt.h>
-
 #ifndef O_CLOEXEC
 #define O_CLOEXEC 0
 #endif
 
+/* Old <libvirt.h> had a slightly different definition of
+ * virDomainGetXMLDesc (using 'int' for flags instead of 'unsigned
+ * int').  To avoid an error trying to redefine it with a different
+ * declaration, don't include <libvirt.h> at all.  Just copy enough to
+ * make the code compile.
+ */
+typedef struct _virDomain virDomain;
+typedef virDomain *virDomainPtr;
+
 char *
 virDomainGetXMLDesc (virDomainPtr dom, unsigned int flags)
 {
-- 
cgit