diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-12-11 13:12:30 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-12-11 13:12:30 (GMT) |
| commit | b023381466b5dad8545191bb8ab0c37eb1a24c22 (patch) | |
| tree | 3776dffd588390c2b113427bcedab971cffe8d9b /Python | |
| parent | cf8f47ea95a2a4833b7c8e3fa42ec8dd1333093a (diff) | |
| download | cpython-b023381466b5dad8545191bb8ab0c37eb1a24c22.zip cpython-b023381466b5dad8545191bb8ab0c37eb1a24c22.tar.gz cpython-b023381466b5dad8545191bb8ab0c37eb1a24c22.tar.bz2 | |
Patch #650415: Avoid redefinition of macros.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/thread_pthread.h | 12 |
1 files changed, 12 insertions, 0 deletions
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 |