From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 11 Dec 2002 13:12:30 +0000 (+0000)
Subject: Patch #650415: Avoid redefinition of macros.
X-Git-Tag: v2.3c1~3069
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b023381466b5dad8545191bb8ab0c37eb1a24c22;p=thirdparty%2FPython%2Fcpython.git

Patch #650415: Avoid redefinition of macros.
---

diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index 6f6fde496b6b..80671215ea82 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -79,14 +79,26 @@
 /* set default attribute object for different versions */
 
 #if defined(PY_PTHREAD_D4) || defined(PY_PTHREAD_D7)
+#if !defined(pthread_attr_default)
 #  define pthread_attr_default pthread_attr_default
+#endif
+#if !defined(pthread_mutexattr_default)
 #  define pthread_mutexattr_default pthread_mutexattr_default
+#endif
+#if !defined(pthread_condattr_default)
 #  define pthread_condattr_default pthread_condattr_default
+#endif
 #elif defined(PY_PTHREAD_STD) || defined(PY_PTHREAD_D6)
+#if !defined(pthread_attr_default)
 #  define pthread_attr_default ((pthread_attr_t *)NULL)
+#endif
+#if !defined(pthread_mutexattr_default)
 #  define pthread_mutexattr_default ((pthread_mutexattr_t *)NULL)
+#endif
+#if !defined(pthread_condattr_default)
 #  define pthread_condattr_default ((pthread_condattr_t *)NULL)
 #endif
+#endif
 
 
 /* Whether or not to use semaphores directly rather than emulating them with