mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Patch #618347: Work around Solaris 2.6 pthread.h bug. Will backport to 2.2.
This commit is contained in:
parent
3d61a06aa2
commit
a7a76d3d9e
4 changed files with 25 additions and 3 deletions
|
@ -3,11 +3,11 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#ifdef __APPLE__
|
#if defined(__APPLE__) || defined(HAVE_PTHREAD_DESTRUCTOR)
|
||||||
#define destructor xxdestructor
|
#define destructor xxdestructor
|
||||||
#endif
|
#endif
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#ifdef __APPLE__
|
#if defined(__APPLE__) || defined(HAVE_PTHREAD_DESTRUCTOR)
|
||||||
#undef destructor
|
#undef destructor
|
||||||
#endif
|
#endif
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
13
configure
vendored
13
configure
vendored
|
@ -1,5 +1,5 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Revision: 1.348 .
|
# From configure.in Revision: 1.349 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.53.
|
# Generated by GNU Autoconf 2.53.
|
||||||
#
|
#
|
||||||
|
@ -10885,6 +10885,17 @@ fi
|
||||||
OSF1) LDLAST=-threads;;
|
OSF1) LDLAST=-threads;;
|
||||||
esac
|
esac
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
# Check for enable-ipv6
|
# Check for enable-ipv6
|
||||||
|
|
|
@ -1326,6 +1326,14 @@ pthread_create (NULL, NULL, start_routine, NULL)], [
|
||||||
OSF1) LDLAST=-threads;;
|
OSF1) LDLAST=-threads;;
|
||||||
esac
|
esac
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
# Check for enable-ipv6
|
# Check for enable-ipv6
|
||||||
|
|
|
@ -304,6 +304,9 @@
|
||||||
/* Define if you have GNU PTH threads. */
|
/* Define if you have GNU PTH threads. */
|
||||||
#undef HAVE_PTH
|
#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. */
|
/* Define to 1 if you have the <pthread.h> header file. */
|
||||||
#undef HAVE_PTHREAD_H
|
#undef HAVE_PTHREAD_H
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue