[Python-checkins] CVS: python/dist/src/Python thread_pthread.h,2.36,2.36.8.1

Michael Hudson mwh@users.sourceforge.net
Sat, 23 Feb 2002 00:43:05 -0800


Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv10304

Modified Files:
      Tag: release22-maint
	thread_pthread.h 
Log Message:
Backport jackjansen's checkin of revision 2.37:

Workaround for what is probably a problem in Apple's gcc: <pthread.h> fails
on a function pointer formal argument called "destructor", which is typedeffed
as a different function pointer type in object.h.



Index: thread_pthread.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/thread_pthread.h,v
retrieving revision 2.36
retrieving revision 2.36.8.1
diff -C2 -d -r2.36 -r2.36.8.1
*** thread_pthread.h	9 Nov 2001 16:00:41 -0000	2.36
--- thread_pthread.h	23 Feb 2002 08:43:03 -0000	2.36.8.1
***************
*** 4,8 ****
--- 4,14 ----
  #include <stdlib.h>
  #include <string.h>
+ #ifdef __APPLE__
+ #define destructor xxdestructor
+ #endif
  #include <pthread.h>
+ #ifdef __APPLE__
+ #undef destructor
+ #endif
  #include <signal.h>