[Python-checkins] r81694 - in python/branches/py3k: Misc/NEWS Modules/_multiprocessing/multiprocessing.h

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Jun  4 19:20:56 2010
New Revision: 81694

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_multiprocessing/multiprocessing.h

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Jun  4 19:20:56 2010
@@ -1328,7 +1328,8 @@
 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

Modified: python/branches/py3k/Modules/_multiprocessing/multiprocessing.h
==============================================================================
--- python/branches/py3k/Modules/_multiprocessing/multiprocessing.h	(original)
+++ python/branches/py3k/Modules/_multiprocessing/multiprocessing.h	Fri Jun  4 19:20:56 2010
@@ -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"