changeset:   91908:a9637b29954d
parent:      91906:ed308c4c72f0
parent:      91907:f618f6739200
user:        Richard Oudkerk <shibturn@gmail.com>
date:        Mon Jul 28 23:13:58 2014 +0100
files:       Misc/ACKS Misc/NEWS
description:
Issue #21704: Merge.


diff -r ed308c4c72f0 -r a9637b29954d Misc/ACKS
--- a/Misc/ACKS	Tue Jul 29 00:07:56 2014 +0200
+++ b/Misc/ACKS	Mon Jul 28 23:13:58 2014 +0100
@@ -52,6 +52,7 @@
 Jon Anglin
 Heidi Annexstad
 Ramchandra Apte
+Arfrever Frehtes Taifersar Arahesis
 Éric Araujo
 Alicia Arlen
 Jeffrey Armstrong
diff -r ed308c4c72f0 -r a9637b29954d Misc/NEWS
--- a/Misc/NEWS	Tue Jul 29 00:07:56 2014 +0200
+++ b/Misc/NEWS	Mon Jul 28 23:13:58 2014 +0100
@@ -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 -r ed308c4c72f0 -r a9637b29954d Modules/_multiprocessing/multiprocessing.c
--- a/Modules/_multiprocessing/multiprocessing.c	Tue Jul 29 00:07:56 2014 +0200
+++ b/Modules/_multiprocessing/multiprocessing.c	Mon Jul 28 23:13:58 2014 +0100
@@ -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}
 };