commit 466e9266d1fb057219624f8adb0d6872d9cc0b18
author Mark Dickinson <dickinsm@gmail.com> Fri Apr 16 16:32:49 2010 +0000
committer Mark Dickinson <dickinsm@gmail.com> Fri Apr 16 16:32:49 2010 +0000
tree cbe52d70457a78d44fdc50ac9e3cc1bb38035754
parent f45c368f4dc40a9573a0464e3ac7c5c1678cb7f7

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.
........

Modules/posixmodule.c

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 @@
 #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