Issue #21704: Merge.

c3fc341c · Richard Oudkerk · d6af0478 · e0e65817 · c3fc341c · c3fc341c
Commit c3fc341c authored Jul 28, 2014 by Richard Oudkerk
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Misc/ACKS Misc/ACKS +1 -0

Misc/NEWS Misc/NEWS +3 -0

Modules/_multiprocessing/multiprocessing.c Modules/_multiprocessing/multiprocessing.c +2 -0

No files found.
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -52,6 +52,7 @@ Ankur Ankan
 Jon Anglin
 Heidi Annexstad
 Ramchandra Apte
+Arfrever Frehtes Taifersar Arahesis
 Éric Araujo
 Alicia Arlen
 Jeffrey Armstrong

--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,9 @@ Core and Builtins
 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.

--- a/Modules/_multiprocessing/multiprocessing.c
+++ b/Modules/_multiprocessing/multiprocessing.c
@@ -128,7 +128,9 @@ static PyMethodDef module_methods[] = {
    {"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}
 };