[Python-checkins] cpython (merge 3.4 -> default): Issue #21704: Merge.

[richard.oudkerk]

http://hg.python.org/cpython/rev/a9637b29954d
changeset:   91908:a9637b29954d
parent:      91906:ed308c4c72f0
parent:      91907:f618f6739200
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Mon Jul 28 23:13:58 2014 +0100
summary:
  Issue #21704: Merge.

files:
  Misc/ACKS                                  |  1 +
  Misc/NEWS                                  |  3 +++
  Modules/_multiprocessing/multiprocessing.c |  2 ++
  3 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -52,6 +52,7 @@
 Jon Anglin
 Heidi Annexstad
 Ramchandra Apte
+Arfrever Frehtes Taifersar Arahesis
 Éric Araujo
 Alicia Arlen
 Jeffrey Armstrong
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,9 @@
 Library
 -------
 
+- Issue #21704: Fix build error for _multiprocessing when semaphores
+  are not available.  Patch by Arfrever Frehtes Taifersar Arahesis.
+
 - Issue #20173: Convert sha1, sha256, sha512 and md5 to ArgumentClinic.
   Patch by Vajrasky Kok.
 
diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c
--- a/Modules/_multiprocessing/multiprocessing.c
+++ b/Modules/_multiprocessing/multiprocessing.c
@@ -128,7 +128,9 @@
     {"recv", multiprocessing_recv, METH_VARARGS, ""},
     {"send", multiprocessing_send, METH_VARARGS, ""},
 #endif
+#ifndef POSIX_SEMAPHORES_NOT_ENABLED
     {"sem_unlink", _PyMp_sem_unlink, METH_VARARGS, ""},
+#endif
     {NULL}
 };
 

-- 
Repository URL: http://hg.python.org/cpython