Commit 1d9d16e8 authored by R. David Murray's avatar R. David Murray

Merged revisions 85554 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85554 | r.david.murray | 2010-10-15 19:12:57 -0400 (Fri, 15 Oct 2010) | 4 lines

  #9862: On AIX PIPE_BUF is broken.  Make it 512.

  Patch by Sébastien Sablé.
........
parent 63e284d3
...@@ -10,6 +10,9 @@ What's New in Python 2.7.1? ...@@ -10,6 +10,9 @@ What's New in Python 2.7.1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding
its value as the default 512 when compiling on AIX.
- Issue #10068: Global objects which have reference cycles with their module's - Issue #10068: Global objects which have reference cycles with their module's
dict are now cleared again. This causes issue #7140 to appear again. dict are now cleared again. This causes issue #7140 to appear again.
......
...@@ -1768,6 +1768,10 @@ initselect(void) ...@@ -1768,6 +1768,10 @@ initselect(void)
PyModule_AddObject(m, "error", SelectError); PyModule_AddObject(m, "error", SelectError);
#ifdef PIPE_BUF #ifdef PIPE_BUF
#ifdef HAVE_BROKEN_PIPE_BUF
#undef PIPE_BUF
#define PIPE_BUF 512
#endif
PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF); PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF);
#endif #endif
......
...@@ -4261,6 +4261,12 @@ AC_CHECK_TYPE(socklen_t,, ...@@ -4261,6 +4261,12 @@ AC_CHECK_TYPE(socklen_t,,
#endif #endif
]) ])
case $ac_sys_system in
AIX*)
AC_DEFINE(HAVE_BROKEN_PIPE_BUF, 1, [Define if the system reports an invalid PIPE_BUF value.]) ;;
esac
AC_SUBST(THREADHEADERS) AC_SUBST(THREADHEADERS)
for h in `(cd $srcdir;echo Python/thread_*.h)` for h in `(cd $srcdir;echo Python/thread_*.h)`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment