Patch #650415: Avoid redefinition of macros.

This commit is contained in:
Martin v. Löwis 2002-12-11 13:12:30 +00:00
parent cf8f47ea95
commit b023381466
1 changed files with 12 additions and 0 deletions

View File

@ -79,14 +79,26 @@
/* set default attribute object for different versions */ /* set default attribute object for different versions */
#if defined(PY_PTHREAD_D4) || defined(PY_PTHREAD_D7) #if defined(PY_PTHREAD_D4) || defined(PY_PTHREAD_D7)
#if !defined(pthread_attr_default)
# define pthread_attr_default pthread_attr_default # define pthread_attr_default pthread_attr_default
#endif
#if !defined(pthread_mutexattr_default)
# define pthread_mutexattr_default pthread_mutexattr_default # define pthread_mutexattr_default pthread_mutexattr_default
#endif
#if !defined(pthread_condattr_default)
# define pthread_condattr_default pthread_condattr_default # define pthread_condattr_default pthread_condattr_default
#endif
#elif defined(PY_PTHREAD_STD) || defined(PY_PTHREAD_D6) #elif defined(PY_PTHREAD_STD) || defined(PY_PTHREAD_D6)
#if !defined(pthread_attr_default)
# define pthread_attr_default ((pthread_attr_t *)NULL) # define pthread_attr_default ((pthread_attr_t *)NULL)
#endif
#if !defined(pthread_mutexattr_default)
# define pthread_mutexattr_default ((pthread_mutexattr_t *)NULL) # define pthread_mutexattr_default ((pthread_mutexattr_t *)NULL)
#endif
#if !defined(pthread_condattr_default)
# define pthread_condattr_default ((pthread_condattr_t *)NULL) # define pthread_condattr_default ((pthread_condattr_t *)NULL)
#endif #endif
#endif
/* Whether or not to use semaphores directly rather than emulating them with /* Whether or not to use semaphores directly rather than emulating them with