From b023381466b5dad8545191bb8ab0c37eb1a24c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 11 Dec 2002 13:12:30 +0000 Subject: Patch #650415: Avoid redefinition of macros. --- Python/thread_pthread.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 6f6fde4..8067121 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 -- cgit v0.12