macOS: use libdispatch only where available (#1596)

Signed-off-by: Sergey Fedorov <[email protected]>
AcademySoftwareFoundation · Dec 18, 2023 · a7befce · a7befce
1 parent 975f6f3
commit a7befce
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/IlmBase/IlmThread/IlmThreadSemaphore.h b/IlmBase/IlmThread/IlmThreadSemaphore.h
@@ -46,6 +46,10 @@
 #include "IlmThreadExport.h"
 #include "IlmThreadNamespace.h"
 
+#if defined(__APPLE__)
+#   include <AvailabilityMacros.h>
+#endif
+
 #if defined _WIN32 || defined _WIN64
 #   ifdef NOMINMAX
 #      undef NOMINMAX
@@ -56,7 +60,7 @@
 
 #ifdef HAVE_POSIX_SEMAPHORES
 #   include <semaphore.h>
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
 #   include <dispatch/dispatch.h>
 #else
 #   ifdef ILMBASE_FORCE_CXX03
@@ -94,7 +98,7 @@ class ILMTHREAD_EXPORT Semaphore
 
 	mutable sem_t _semaphore;
 
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
 	mutable dispatch_semaphore_t _semaphore;
 
 #else

diff --git a/IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp b/IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp
@@ -41,6 +41,10 @@
 
 #if defined(__APPLE__)
 
+#include <AvailabilityMacros.h>
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
+
 #include "IlmThreadSemaphore.h"
 #include "Iex.h"
 
@@ -96,3 +100,5 @@ Semaphore::value () const
 ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_EXIT
 
 #endif
+
+#endif
diff --git a/IlmBase/IlmThread/IlmThreadSemaphorePosixCompat.cpp b/IlmBase/IlmThread/IlmThreadSemaphorePosixCompat.cpp
@@ -42,7 +42,12 @@
 #include "IlmBaseConfig.h"
 #include "IlmThreadSemaphore.h"
 
-#if !defined (HAVE_POSIX_SEMAPHORES) && !defined (__APPLE__)
+#if defined(__APPLE__)
+#    include <AvailabilityMacros.h>
+#endif
+
+#if !defined (HAVE_POSIX_SEMAPHORES) && \
+    (!defined(__APPLE__) || (defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060 || defined(__ppc__))))
 #if (!defined (_WIN32) && !defined (_WIN64)) || defined (__MINGW64_VERSION_MAJOR)
 
 #include "Iex.h"