Patch #650415: Avoid redefinition of macros.

diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index 6f6fde496b6b98f2e9448137c4b23b0fbf6bed10..80671215ea82843e5455a17842fd08053e8abd66 100644 (file)
--- 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