remove hack for macOS 10.4

mixxxdj · Jan 14, 2021 · 925bba3 · 925bba3
1 parent 0573fe7
commit 925bba3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,10 +33,6 @@ if(APPLE)
 
   find_library(Carbon_LIBRARY Carbon REQUIRED)
   target_link_libraries(hss1394 PUBLIC ${Carbon_LIBRARY})
-
-  if(CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.4u")
-    target_compile_definitions(hss1394 PRIVATE "OSX10_4")
-  endif()
 elseif(WIN32)
   target_sources(hss1394 PRIVATE src/1394API_VHPD1394.cpp)
   target_compile_definitions(hss1394 PRIVATE "_WIN32_")

diff --git a/src/1394API_macOS.cpp b/src/1394API_macOS.cpp
@@ -344,21 +344,12 @@ static bool localOpenBus(void) {
 // Callback for arrival/processing of 1394 packet.
 //-----------------------------------------------------------------------------
 static
-#ifdef OSX10_4
 UInt32 local1394WriteHandler(
 							 IOFireWireLibPseudoAddressSpaceRef pAddressSpace,
 							 FWClientCommandID tCommandID,
 							 UInt32 uDataLength, void* pData,
-							 UInt16 uNodeId, UInt32 uAddressHi, 
-							 UInt32 uAddressLo, UInt32 refCon)
-#else
-UInt32 local1394WriteHandler(
-							 IOFireWireLibPseudoAddressSpaceRef pAddressSpace,
-							 FWClientCommandID tCommandID,
-							 UInt32 uDataLength, void* pData,
-							 UInt16 uNodeId, UInt32 uAddressHi, 
+							 UInt16 uNodeId, UInt32 uAddressHi,
 							 UInt32 uAddressLo, void* refCon)
-#endif
 {
 	// Remove Bus number data (ignored)
 	uNodeId &= 0x3f;