Merged revisions 81692 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81692 | martin.v.loewis | 2010-06-04 19:18:42 +0200 (Fr, 04 Jun 2010) | 3 lines

  Issue #8864: Define _XOPEN_SOURCE on Solaris for the
  multiprocessing module.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 0dff2313319a30af794a7e9247e3d6f1fde0266e..1bd8a5f138519d5b22f0e9d93d5013d00a218745 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1328,7 +1328,8 @@ Extension Modules
 Build
 -----
 
-- Issue #1759169: Drop _XOPEN_SOURCE on Solaris.
+- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for
+  multiprocessing only.
 
 - Issue #8625: Turn off optimization in --with-pydebug builds with
   gcc.  (Optimization was unintentionally turned on in gcc

diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
index c1496343c39151592e35c7503a0cc7130b120aef..14425de82186b09e92cd8abe8a7eed28212e8506 100644 (file)
--- a/Modules/_multiprocessing/multiprocessing.h
+++ b/Modules/_multiprocessing/multiprocessing.h
@@ -3,6 +3,12 @@
 
 #define PY_SSIZE_T_CLEAN
 
+#ifdef __sun
+/* The control message API is only available on Solaris 
+   if XPG 4.2 or later is requested. */
+#define _XOPEN_SOURCE 500
+#endif
+
 #include "Python.h"
 #include "structmember.h"
 #include "pythread.h"