[libvirt] [libvirt-python PATCHv2 12/44] Import LIBVIR_CHECK_VERSION macro from libvirt

Doug Goldstein cardoe at cardoe.com
Tue Nov 19 19:35:31 UTC 2013


Add LIBVIR_CHECK_VERSION from libvirt upstream so that we can check the
version of the library we are compiling against and support a range of
libvirt versions. The macro was added to libvirt in 1.2.0 so we must
provide it if its not defined.
---
 libvirt-utils.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libvirt-utils.h b/libvirt-utils.h
index 795f678..447e81f 100644
--- a/libvirt-utils.h
+++ b/libvirt-utils.h
@@ -28,6 +28,16 @@
 #  define MIN(a,b) (((a) < (b)) ? (a) : (b))
 # endif
 
+/**
+ * libvirt.h provides this as of version 1.1.5, but we want to be able
+ * to support older versions of libvirt so copy and paste the macro from
+ * libvirt.h
+ */
+# ifndef LIBVIR_CHECK_VERSION
+#  define LIBVIR_CHECK_VERSION(major, minor, micro) \
+    ((major) * 1000000 + (minor) * 1000 + (micro) <= LIBVIR_VERSION_NUMBER)
+# endif
+
 /* Return 1 if an array of N objects, each of size S, cannot exist due
    to size arithmetic overflow.  S must be positive and N must be
    nonnegative.  This is a macro, not a function, so that it
-- 
1.8.3.2




More information about the libvir-list mailing list