From f41ba90c186acd8573a9653851ef73437d89d3ba Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 18 Apr 2008 18:07:40 +0000
Subject: [PATCH] Work around Python.h name-space pollution.

* python/libvir.c (HAVE_PTHREAD_H): #undef.
Without this, we'd get a redefinition warning.
---
 ChangeLog       | 6 ++++++
 python/libvir.c | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7e1d3b6ad9..d2494ab779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 18 20:07:12 CEST 2008 Jim Meyering <meyering@redhat.com>
+
+	Work around Python.h name-space pollution.
+	* python/libvir.c (HAVE_PTHREAD_H): #undef.
+	Without this, we'd get a redefinition warning.
+
 Fri Apr 18 11:26:24 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* tests/Makefile.am: Add abs_srcdir and abs_builddir to test
diff --git a/python/libvir.c b/python/libvir.c
index 0ca2dca142..8258cc24de 100644
--- a/python/libvir.c
+++ b/python/libvir.c
@@ -4,13 +4,18 @@
  *           entry points where an automatically generated stub is
  *           unpractical
  *
- * Copyright (C) 2005, 2007 Red Hat, Inc.
+ * Copyright (C) 2005, 2007, 2008 Red Hat, Inc.
  *
  * Daniel Veillard <veillard@redhat.com>
  */
 
 #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 <Python.h>
 #include "libvirt/libvirt.h"
 #include "libvirt/virterror.h"