[Python-checkins] r85556 - in python/branches/release27-maint: Misc/NEWS Modules/selectmodule.c configure.in

[r.david.murray]

Author: r.david.murray
Date: Sat Oct 16 02:43:13 2010
New Revision: 85556

Log:
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é.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Modules/selectmodule.c
   python/branches/release27-maint/configure.in

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Oct 16 02:43:13 2010
@@ -10,6 +10,9 @@
 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
   dict are now cleared again. This causes issue #7140 to appear again.
 

Modified: python/branches/release27-maint/Modules/selectmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/selectmodule.c	(original)
+++ python/branches/release27-maint/Modules/selectmodule.c	Sat Oct 16 02:43:13 2010
@@ -1768,6 +1768,10 @@
     PyModule_AddObject(m, "error", SelectError);
 
 #ifdef PIPE_BUF
+#ifdef HAVE_BROKEN_PIPE_BUF
+#undef PIPE_BUF
+#define PIPE_BUF 512
+#endif
     PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF);
 #endif
 

Modified: python/branches/release27-maint/configure.in
==============================================================================
--- python/branches/release27-maint/configure.in	(original)
+++ python/branches/release27-maint/configure.in	Sat Oct 16 02:43:13 2010
@@ -4261,6 +4261,12 @@
 #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)
 
 for h in `(cd $srcdir;echo Python/thread_*.h)`