diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-12-11 13:12:30 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-12-11 13:12:30 +0000 |
| commit | 1cb455540d24f4c4258ffcbb4d450b1ca274c029 (patch) | |
| tree | 9de64f758c73861b924a3129a2a14e144bd3cd82 /Python | |
| parent | 94c105552b017af08b3763d3de8e8462dc16d642 (diff) | |
| download | cpython-1cb455540d24f4c4258ffcbb4d450b1ca274c029.tar.gz | |
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 6f6fde496b..80671215ea 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 |