From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Tue, 10 Apr 2012 10:24:03 +0000 (-0400)
Subject: Fix compilation error on 32bit
X-Git-Tag: v0.9.12-rc1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e9bb1dffdf456282b69ab077288c9bf875b8afa;p=thirdparty%2Flibvirt.git

Fix compilation error on 32bit

Below code failed to compile on a 32 bit machine with error

typewrappers.c: In function 'libvirt_intUnwrap':
typewrappers.c:135:5: error: logical 'and' of mutually exclusive tests is always false [-Werror=logical-op]
cc1: all warnings being treated as errors

The patch fixes this error.
---

diff --git a/python/typewrappers.c b/python/typewrappers.c
index 026cb6b4f1..c525e592a3 100644
--- a/python/typewrappers.c
+++ b/python/typewrappers.c
@@ -132,6 +132,7 @@ libvirt_intUnwrap(PyObject *obj, int *val)
     if ((long_val == -1) && PyErr_Occurred())
         return -1;
 
+#if LONG_MAX != INT_MAX
     if (long_val >= INT_MIN && long_val <= INT_MAX) {
         *val = long_val;
     } else {
@@ -139,6 +140,9 @@ libvirt_intUnwrap(PyObject *obj, int *val)
                         "Python int too large to convert to C int");
         return -1;
     }
+#else
+    *val = long_val;
+#endif
     return 0;
 }