diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-04-16 16:32:49 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-04-16 16:32:49 (GMT) |
| commit | 466e9266d1fb057219624f8adb0d6872d9cc0b18 (patch) | |
| tree | cbe52d70457a78d44fdc50ac9e3cc1bb38035754 /Modules/posixmodule.c | |
| parent | f45c368f4dc40a9573a0464e3ac7c5c1678cb7f7 (diff) | |
| download | cpython-466e9266d1fb057219624f8adb0d6872d9cc0b18.zip cpython-466e9266d1fb057219624f8adb0d6872d9cc0b18.tar.gz cpython-466e9266d1fb057219624f8adb0d6872d9cc0b18.tar.bz2 | |
Merged revisions 80108,80111,80114-80115 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r80108 | victor.stinner | 2010-04-16 13:23:43 +0100 (Fri, 16 Apr 2010) | 4 lines
Add CS_GNU_LIBC_VERSION and CS_GNU_LIBPTHREAD_VERSION constants for constr(),
and disable test_execvpe_with_bad_program() of test_os if the libc uses
linuxthreads to avoid the "unknown signal 32" bug (see issue #4970).
........
r80111 | mark.dickinson | 2010-04-16 13:47:52 +0100 (Fri, 16 Apr 2010) | 1 line
Keep confstr entries in alphabetical order.
........
r80114 | mark.dickinson | 2010-04-16 14:45:35 +0100 (Fri, 16 Apr 2010) | 1 line
Issue #4970: move linuxthreads check outside the affected test, and use skipIf
........
r80115 | mark.dickinson | 2010-04-16 14:51:27 +0100 (Fri, 16 Apr 2010) | 1 line
Don't assume that os.confstr_names exists.
........
Diffstat (limited to 'Modules/posixmodule.c')
| -rw-r--r-- | Modules/posixmodule.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index bba75af..c7e0736 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -6028,6 +6028,12 @@ static struct constdef posix_constants_confstr[] = { #ifdef _CS_ARCHITECTURE {"CS_ARCHITECTURE", _CS_ARCHITECTURE}, #endif +#ifdef _CS_GNU_LIBC_VERSION + {"CS_GNU_LIBC_VERSION", _CS_GNU_LIBC_VERSION}, +#endif +#ifdef _CS_GNU_LIBPTHREAD_VERSION + {"CS_GNU_LIBPTHREAD_VERSION", _CS_GNU_LIBPTHREAD_VERSION}, +#endif #ifdef _CS_HOSTNAME {"CS_HOSTNAME", _CS_HOSTNAME}, #endif |