diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-10-04 07:21:24 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-10-04 07:21:24 (GMT) |
| commit | a7a76d3d9eb77b4dd3129d34ba8df636ce2e6014 (patch) | |
| tree | 0cc2558cbe36eed85ac9a84cd304a856c9977f8c | |
| parent | 3d61a06aa288f2fc64f33c6b09c0778ac4083861 (diff) | |
| download | cpython-a7a76d3d9eb77b4dd3129d34ba8df636ce2e6014.zip cpython-a7a76d3d9eb77b4dd3129d34ba8df636ce2e6014.tar.gz cpython-a7a76d3d9eb77b4dd3129d34ba8df636ce2e6014.tar.bz2 | |
Patch #618347: Work around Solaris 2.6 pthread.h bug. Will backport to 2.2.
| -rw-r--r-- | Python/thread_pthread.h | 4 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | pyconfig.h.in | 3 |
4 files changed, 25 insertions, 3 deletions
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 556445e..c9f6957 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -3,11 +3,11 @@ #include <stdlib.h> #include <string.h> -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(HAVE_PTHREAD_DESTRUCTOR) #define destructor xxdestructor #endif #include <pthread.h> -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(HAVE_PTHREAD_DESTRUCTOR) #undef destructor #endif #include <signal.h> @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.348 . +# From configure.in Revision: 1.349 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -10885,6 +10885,17 @@ fi OSF1) LDLAST=-threads;; esac fi + + if test "$posix_threads" = yes -a \ + "$ac_sys_system" = "SunOS" -a \ + "$ac_sys_release" = "5.6"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_DESTRUCTOR 1 +_ACEOF + + fi + fi # Check for enable-ipv6 diff --git a/configure.in b/configure.in index 27462a6..fef6e22 100644 --- a/configure.in +++ b/configure.in @@ -1326,6 +1326,14 @@ pthread_create (NULL, NULL, start_routine, NULL)], [ OSF1) LDLAST=-threads;; esac fi + + if test "$posix_threads" = yes -a \ + "$ac_sys_system" = "SunOS" -a \ + "$ac_sys_release" = "5.6"; then + AC_DEFINE(HAVE_PTHREAD_DESTRUCTOR, 1, + [Defined for Solaris 2.6 bug in pthread header.]) + fi + fi # Check for enable-ipv6 diff --git a/pyconfig.h.in b/pyconfig.h.in index 3622be8..f5cc30e 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -304,6 +304,9 @@ /* Define if you have GNU PTH threads. */ #undef HAVE_PTH +/* Defined for Solaris 2.6 bug in pthread header. */ +#undef HAVE_PTHREAD_DESTRUCTOR + /* Define to 1 if you have the <pthread.h> header file. */ #undef HAVE_PTHREAD_H |