From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 18 Dec 2013 16:15:08 +0000 (+0000)
Subject: Remove redefinition of bool type when --enable-test-locking
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c6803a7312655e3e79f53409adf57f4860fcd380;p=libvirt.git

Remove redefinition of bool type when --enable-test-locking

Old versions of CIL did not understand the 'bool' data type,
but at least 1.7.3 does now cope. We can remove the old hack
which redefined bool and no longer compiles successfully.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 2ebb9412ca..ddbcc8ec1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2129,7 +2129,7 @@ AC_ARG_ENABLE([test-locking],
 enable_locking=$enableval
 
 if test "$enable_locking" = "yes"; then
-  LOCK_CHECKING_CFLAGS="-Dbool=char -D_Bool=char -save-temps"
+  LOCK_CHECKING_CFLAGS="-save-temps"
   AC_SUBST([LOCK_CHECKING_CFLAGS])
 fi
 AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"])