[Python-checkins] python/dist/src/Python thread_pthread.h,2.42,2.43
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Wed, 11 Dec 2002 05:12:32 -0800
Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv29274
Modified Files:
thread_pthread.h
Log Message:
Patch #650415: Avoid redefinition of macros.
Index: thread_pthread.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/thread_pthread.h,v
retrieving revision 2.42
retrieving revision 2.43
diff -C2 -d -r2.42 -r2.43
*** thread_pthread.h 2 Dec 2002 22:17:01 -0000 2.42
--- thread_pthread.h 11 Dec 2002 13:12:30 -0000 2.43
***************
*** 80,90 ****
--- 80,102 ----
#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