Python header workaround

diff --git a/ChangeLog b/ChangeLog
index d2494ab7794ad5233390f755db73a5e68fb6a68a..8bb5e98b3e8d10f4e77e91f8e76e34062859b1de 100644 (file)
--- 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 6857c106fa44f6dbe21feb81e7238045fc3c18e1..e4bad8aa781f0202291bdf28a1c3c85e9bdedb20 100644 (file)
--- 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 *