From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 18 Apr 2008 18:31:32 +0000 (+0000)
Subject: Python header workaround
X-Git-Tag: LIBVIRT_0_4_4~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b11f2be30e23cd18c770fe121ef4e2569c0963b7;p=thirdparty%2Flibvirt.git

Python header workaround
---

diff --git a/ChangeLog b/ChangeLog
index d2494ab779..8bb5e98b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 18 14:30:12 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	Work around Python.h name-space pollution.
+	* python/types.c (HAVE_PTHREAD_H): #undef.
+	Without this, we'd get a redefinition warning.
+
 Fri Apr 18 20:07:12 CEST 2008 Jim Meyering <meyering@redhat.com>
 
 	Work around Python.h name-space pollution.
diff --git a/python/types.c b/python/types.c
index 6857c106fa..e4bad8aa78 100644
--- a/python/types.c
+++ b/python/types.c
@@ -9,6 +9,11 @@
 
 #include <config.h>
 
+/* Horrible kludge to work around even more horrible name-space pollution
+ *    via Python.h.  That file includes /usr/include/python2.5/pyconfig*.h,
+ *       which has over 180 autoconf-style HAVE_* definitions.  Shame on them.  */
+#undef HAVE_PTHREAD_H
+
 #include "libvirt_wrap.h"
 
 PyObject *