Ticket #5554: xplthread.patch

hula/include/xplthread.h

@@ -201 +201 @@
 
 
 #ifdef HAVE_SEMAPHORE_H
+
 /* Semaphores */
  /**********************
   Semaphores
  **********************/
-#define XplSemaphore                                                                                                    sem_t
+
+#ifdef MACOSX
+
+#include <Multiprocessing.h>
+#include <MacErrors.h>
+
+#define XplSemaphore                                                                    MPSemaphoreID
+#define XplOpenLocalSemaphore(sem, init)                                                (MPCreateSemaphore(0x7fffffff,init,&sem) != noErr ? -1 : (int) sem)
+#define XplCloseLocalSemaphore(sem)                                                     (MPDeleteSemaphore(sem) != noErr ? -1 : 0)
+#define XplWaitOnLocalSemaphore(sem)                                                    (MPWaitOnSemaphore(sem,kDurationForever) != noErr ? -1 : 0)
+#define XplSignalLocalSemaphore(sem)                                                    (MPSignalSemaphore(sem) != noErr ? -1 : 0)
+#define XplExamineLocalSemaphore(sem, cnt)                                              if (MPWaitOnSemaphore(sem,kDurationImmediate) != kMPTimeoutErr) { MPSignalSemaphore(sem); cnt = 1; } else { cnt = 0; }
+
+#else
+
+#define XplSemaphore                                                                    sem_t
 #define XplOpenLocalSemaphore(sem, init)                                                sem_init(&sem, 0, init)
-#define XplCloseLocalSemaphore(sem)                                                             sem_destroy(&sem)
+#define XplCloseLocalSemaphore(sem)                                                     sem_destroy(&sem)
 #define XplWaitOnLocalSemaphore(sem)                                                    sem_wait(&sem)
 #define XplSignalLocalSemaphore(sem)                                                    sem_post(&sem)
-#define XplExamineLocalSemaphore(sem, cnt)                                      sem_getvalue(&sem, (int *)&cnt)
+#define XplExamineLocalSemaphore(sem, cnt)                                              sem_getvalue(&sem, (int *)&cnt)
 
+#endif
+
 #elif defined(WIN32)
 
 #define XplSemaphore                                                            HANDLE

hula/configure.in

@@ -301 +301 @@
       PTHREAD_LIBS="-pthread -lc_r"
     fi
   ;;
+  *darwin*)
+    #As of 10.4.2, POSIX Unnamed Semaphores are not implemented, use Carbon Semaphores instead
+    PTHREAD_LIBS="-lpthread -framework Carbon"
+    PTHREAD_CFLAGS="-I/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers"
+    CFLAGS="$CFLAGS -DMACOSX"
+  ;;
 esac
 AC_MSG_CHECKING(pthread cflags)
 AC_MSG_RESULT($PTHREAD_CFLAGS)