Revert "Fix FireWire compilation on mac when compiling in 64 bits mode."

This reverts commit 63128e2.

Author: jyavenard

mythtv/libs/libmythtv/darwinfirewiredevice.cpp

@@ -62,12 +62,12 @@ namespace AVS
 #define kResetTimeout             1500 /* msec */
 
 static IOReturn dfd_tspacket_handler_thunk(
-    UInt32 tsPacketCount, UInt32 **ppBuf, void *callback_data);
+    long unsigned int tsPacketCount, UInt32 **ppBuf, void *callback_data);
 static void dfd_update_device_list(void *dfd, io_iterator_t iterator);
 static void dfd_streaming_log_message(char *pString);
 void *dfd_controller_thunk(void *param);
-void dfd_stream_msg(UInt32 msg, UInt32 param1,
-                    UInt32 param2, void *callback_data);
+void dfd_stream_msg(long unsigned int msg, long unsigned int param1,
+                    long unsigned int param2, void *callback_data);
 int dfd_no_data_notification(void *callback_data);
 
 class DFDPriv
@@ -894,8 +894,8 @@ int dfd_no_data_notification(void *callback_data)
     return kIOReturnSuccess;
 }
 
-void dfd_stream_msg(UInt32 msg, UInt32 param1,
-                    UInt32 param2, void *callback_data)
+void dfd_stream_msg(long unsigned int msg, long unsigned int param1,
+                    long unsigned int param2, void *callback_data)
 {
     ((DarwinFirewireDevice*)callback_data)->
         ProcessStreamingMessage(msg, param1, param2);
@@ -915,7 +915,7 @@ int dfd_tspacket_handler(uint tsPacketCount, uint32_t **ppBuf,
 }
 
 static IOReturn dfd_tspacket_handler_thunk(
-    UInt32 tsPacketCount, UInt32 **ppBuf, void *callback_data)
+    long unsigned int tsPacketCount, UInt32 **ppBuf, void *callback_data)
 {
     return dfd_tspacket_handler(
         tsPacketCount, (uint32_t**)ppBuf, callback_data);

mythtv/libs/libmythtv/darwinfirewiredevice.h

@@ -2,7 +2,6 @@
 #define _DARWIN_FIREWIRE_DEVICE_H_
 
 #include "firewiredevice.h"
-#include <IOKit/IOKitLib.h>
 
 class DFDPriv;
 class DarwinAVCInfo;
@@ -14,8 +13,8 @@ class DarwinFirewireDevice : public FirewireDevice
                                        uint64_t guid, void *item);
     friend int dfd_no_data_notification(void *cb_data);
     friend void dfd_stream_msg(
-        UInt32 msg, UInt32 param1,
-        UInt32 param2, void *callback_data);
+        long unsigned int msg, long unsigned int param1,
+        long unsigned int param2, void *callback_data);
     friend int dfd_tspacket_handler(
         uint tsPacketCount, uint32_t **ppBuf, void *callback_data);
 

mythtv/libs/libmythtv/firewirechannel.cpp

@@ -8,9 +8,7 @@
 #include "mythverbose.h"
 #include "tv_rec.h"
 #include "linuxfirewiredevice.h"
-#if USING_OSX_FIREWIRE
 #include "darwinfirewiredevice.h"
-#endif
 #include "firewirechannel.h"
 
 #define LOC QString("FireChan(%1): ").arg(GetDevice())

mythtv/libs/libmythtv/firewiredevice.cpp

@@ -12,9 +12,7 @@
 
 // MythTV headers
 #include "linuxfirewiredevice.h"
-#if USING_OSX_FIREWIRE
 #include "darwinfirewiredevice.h"
-#endif
 #include "mythverbose.h"
 #include "pespacket.h"