[Python-checkins] r71022 - in python/trunk: Misc/NEWS Modules/_multiprocessing/multiprocessing.h

[jesse.noller]

Author: jesse.noller
Date: Thu Apr  2 04:32:55 2009
New Revision: 71022

Log:
Issue 3110: Additional protection for SEM_VALUE_MAX on platforms, thanks to Martin Loewis

Modified:
   python/trunk/Misc/NEWS
   python/trunk/Modules/_multiprocessing/multiprocessing.h

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Apr  2 04:32:55 2009
@@ -202,6 +202,8 @@
 Library
 -------
 
+- Issue #3110: Add additional protect around SEM_VALUE_MAX for multiprocessing
+
 - In Pdb, prevent the reassignment of __builtin__._ by sys.displayhook on
   printing out values.
 

Modified: python/trunk/Modules/_multiprocessing/multiprocessing.h
==============================================================================
--- python/trunk/Modules/_multiprocessing/multiprocessing.h	(original)
+++ python/trunk/Modules/_multiprocessing/multiprocessing.h	Thu Apr  2 04:32:55 2009
@@ -45,13 +45,18 @@
  * Issue 3110 - Solaris does not define SEM_VALUE_MAX
  */
 #ifndef SEM_VALUE_MAX
-#  ifdef _SEM_VALUE_MAX
-#    define SEM_VALUE_MAX _SEM_VALUE_MAX
-#  else
-#    define SEM_VALUE_MAX INT_MAX
-#  endif
+	#if defined(HAVE_SYSCONF) && defined(_SC_SEM_VALUE_MAX)
+		# define SEM_VALUE_MAX sysconf(_SC_SEM_VALUE_MAX)
+	#elif defined(_SEM_VALUE_MAX)
+		# define SEM_VALUE_MAX _SEM_VALUE_MAX
+	#elif definef(_POSIX_SEM_VALUE_MAX)
+		# define SEM_VALUE_MAX _POSIX_SEM_VALUE_MAX
+	#else
+		# define SEM_VALUE_MAX INT_MAX
+	#endif
 #endif
 
+
 /*
  * Make sure Py_ssize_t available
  */