Issue #7272, continued: don't re-use existing HAVE_BROKEN_POSIX_SEMAPHORES

to indicate that semaphores aren't available;  define a new variable
POSIX_SEMAPHORES_NOT_ENABLED instead.

diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c
index cb6725bc33d27b337e497b805fb8afcfc33abf7e..e86703088b688b25a759697a655d2701723d0ce1 100644 (file)
--- a/Modules/_multiprocessing/multiprocessing.c
+++ b/Modules/_multiprocessing/multiprocessing.c
@@ -251,7 +251,7 @@ init_multiprocessing(void)
        PyModule_AddObject(module, "Connection", (PyObject*)&ConnectionType);
 
 #if defined(MS_WINDOWS) ||                                             \
-  (defined(HAVE_SEM_OPEN) && !defined(HAVE_BROKEN_POSIX_SEMAPHORES))
+  (defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED))
        /* Add SemLock type to module */
        if (PyType_Ready(&SemLockType) < 0)
                return;
@@ -298,7 +298,7 @@ init_multiprocessing(void)
                Py_DECREF(temp); Py_DECREF(value); return; }      \
        Py_DECREF(value)
        
-#if defined(HAVE_SEM_OPEN) && !defined(HAVE_BROKEN_POSIX_SEMAPHORES)
+#if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
        ADD_FLAG(HAVE_SEM_OPEN);
 #endif
 #ifdef HAVE_SEM_TIMEDWAIT

diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
index 7c98ca782f9c5a65298d9cf0f531ffdc9acf834d..3dd01994f4e089053391d9a47c192a7e37accfe2 100644 (file)
--- a/Modules/_multiprocessing/multiprocessing.h
+++ b/Modules/_multiprocessing/multiprocessing.h
@@ -27,7 +27,7 @@
 #  include <sys/socket.h>
 #  include <sys/uio.h>
 #  include <arpa/inet.h>             /* htonl() and ntohl() */
-#  if defined(HAVE_SEM_OPEN) && !defined(HAVE_BROKEN_POSIX_SEMAPHORES)
+#  if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
 #    include <semaphore.h>
      typedef sem_t *SEM_HANDLE;
 #  endif

diff --git a/configure b/configure
index a006a8e543213bc6c7eeff2b6b34077b90a67aea..9fd579adc52020e34c40127cc6285c21ca5536bc 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 76432 .
+# From configure.in Revision: 76550 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -23876,7 +23876,7 @@ if test $ac_cv_posix_semaphores_enabled = no
 then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_POSIX_SEMAPHORES 1
+#define POSIX_SEMAPHORES_NOT_ENABLED 1
 _ACEOF
 
 fi

diff --git a/configure.in b/configure.in
index 3bef205e81654f213c55420033aea3d1e0bbebd1..044464fa69a05e8c249e0c194e66427bc2dad0d8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3419,8 +3419,8 @@ int main(void) {
 AC_MSG_RESULT($ac_cv_posix_semaphores_enabled)
 if test $ac_cv_posix_semaphores_enabled = no
 then
-  AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
-            [Define if the Posix semaphores do not work on your system])
+  AC_DEFINE(POSIX_SEMAPHORES_NOT_ENABLED, 1,
+            [Define if POSIX semaphores aren't enabled on your system])
 fi
 
 

diff --git a/pyconfig.h.in b/pyconfig.h.in
index 5900cb052f7ce136deda45e0711c2ac2b24015c0..7541213d8e2b642dfecd6b494e17673a4f5a0758 100644 (file)
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -909,6 +909,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define if POSIX semaphores aren't enabled on your system */
+#undef POSIX_SEMAPHORES_NOT_ENABLED
+
 /* Defined if PTHREAD_SCOPE_SYSTEM supported. */
 #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
 

diff --git a/setup.py b/setup.py
index 75ff11fc0c1582f1ff36f7290b33ecf7da85a509..d7ef51ef0faf4cf35c1af1c91c54a9d0bfa06eeb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1316,7 +1316,7 @@ class PyBuildExt(build_ext):
                                      '_multiprocessing/socket_connection.c'
                                    ]
             if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                sysconfig.get_config_var('HAVE_BROKEN_POSIX_SEMAPHORES')):
+                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
                 multiprocessing_srcs.append('_multiprocessing/semaphore.c')
 
         if sysconfig.get_config_var('WITH_THREAD'):