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

[richard.oudkerk]

http://hg.python.org/cpython/rev/92990dd91b07
changeset:   81193:92990dd91b07
parent:      81190:6e10b04caeb6
parent:      81192:a70db584e897
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Tue Jan 01 17:40:58 2013 +0000
summary:
  Issue #9586: Merge.

files:
  Misc/NEWS                            |  2 ++
  Modules/_multiprocessing/semaphore.c |  7 +++++++
  2 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -200,6 +200,8 @@
 Library
 -------
 
+- Issue #9586: Redefine SEM_FAILED on MacOSX to keep compiler happy.
+
 - Issue #16787: Increase asyncore and asynchat default output buffers size, to
   decrease CPU usage and increase throughput.
 
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -186,6 +186,13 @@
 #define SEM_GETVALUE(sem, pval) sem_getvalue(sem, pval)
 #define SEM_UNLINK(name) sem_unlink(name)
 
+/* OS X 10.4 defines SEM_FAILED as -1 instead of (sem_t *)-1;  this gives
+   compiler warnings, and (potentially) undefined behaviour. */
+#ifdef __APPLE__
+#  undef SEM_FAILED
+#  define SEM_FAILED ((sem_t *)-1)
+#endif
+
 #ifndef HAVE_SEM_UNLINK
 #  define sem_unlink(name) 0
 #endif

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