From 925bba3907d5d0176f2ba3e75c97e9d058b0ccb2 Mon Sep 17 00:00:00 2001
From: Be <be@mixxx.org>
Date: Thu, 14 Jan 2021 16:28:56 -0600
Subject: [PATCH] remove hack for macOS 10.4

---
 CMakeLists.txt        |  4 ----
 src/1394API_macOS.cpp | 11 +----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2077f21..5f8e54c 100644
--- 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
index 6d2891b..657cd7c 100755
--- 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;