Merged revisions 76566 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76566 | mark.dickinson | 2009-11-28 12:48:43 +0000 (Sat, 28 Nov 2009) | 18 lines

  Merged revisions 76432,76558 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76432 | mark.dickinson | 2009-11-20 19:30:22 +0000 (Fri, 20 Nov 2009) | 5 lines

    Issue #7272:  Add configure test to detect whether sem_open works
    properly, and use this to skip test_multiprocessing on platforms
    where sem_open raises a signal.  This should fix some FreeBSD buildbot
    failures for test_multiprocessing.
  ........
    r76558 | mark.dickinson | 2009-11-28 10:44:20 +0000 (Sat, 28 Nov 2009) | 4 lines

    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.h b/Modules/_multiprocessing/multiprocessing.h
index 7a79d6e..3dd0199 100644
--- 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() */
-#  ifdef HAVE_SEM_OPEN
+#  if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
 #    include <semaphore.h>
      typedef sem_t *SEM_HANDLE;
 #  endif