merge 66184 to fix issue3110 to py3k

diff --git a/Misc/NEWS b/Misc/NEWS
index 355633d0425c594d953ba989f0b0ed2afd733368..e33e6c50cc6e3ac8a2d81064ed48cd5c57ed8b75 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -71,6 +71,9 @@ Library
 
 - The deprecation warnings for the camelCase threading API names were removed.
 
+- Issue #3110: multiprocessing fails to compiel on solaris 10 due to missing 
+  SEM_VALUE_MAX.
+
 Extension Modules
 -----------------
 

diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
index 57eb7b4b98347f535fbf7402d8faa73cc912e2ca..ec5042c9d6424a5a9941558b5fc02b85229e6349 100644 (file)
--- a/Modules/_multiprocessing/multiprocessing.h
+++ b/Modules/_multiprocessing/multiprocessing.h
@@ -36,6 +36,17 @@
 #  define INVALID_HANDLE_VALUE (-1)
 #endif
 
+/*
+ * 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
+#endif
+
 /*
  * Make sure Py_ssize_t available
  */