Skip to content
Browse files

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

Also, darwin firewire headers were being included also for non-darwin platforms

Conflicts:

	mythtv/libs/libmythtv/firewiredevice.cpp
[cherry-picked from 3196c2c]
  • Loading branch information...
1 parent 52ede76 commit 63128e2a83db9bd78dc45af3ce9b243c97b34959 @jyavenard jyavenard committed Mar 1, 2012
View
12 mythtv/libs/libmythtv/darwinfirewiredevice.cpp
@@ -62,12 +62,12 @@ namespace AVS
#define kResetTimeout 1500 /* msec */
static IOReturn dfd_tspacket_handler_thunk(
- long unsigned int tsPacketCount, UInt32 **ppBuf, void *callback_data);
+ UInt32 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(long unsigned int msg, long unsigned int param1,
- long unsigned int param2, void *callback_data);
+void dfd_stream_msg(UInt32 msg, UInt32 param1,
+ UInt32 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(long unsigned int msg, long unsigned int param1,
- long unsigned int param2, void *callback_data)
+void dfd_stream_msg(UInt32 msg, UInt32 param1,
+ UInt32 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(
- long unsigned int tsPacketCount, UInt32 **ppBuf, void *callback_data)
+ UInt32 tsPacketCount, UInt32 **ppBuf, void *callback_data)
{
return dfd_tspacket_handler(
tsPacketCount, (uint32_t**)ppBuf, callback_data);
View
5 mythtv/libs/libmythtv/darwinfirewiredevice.h
@@ -2,6 +2,7 @@
#define _DARWIN_FIREWIRE_DEVICE_H_
#include "firewiredevice.h"
+#include <IOKit/IOKitLib.h>
class DFDPriv;
class DarwinAVCInfo;
@@ -13,8 +14,8 @@ class DarwinFirewireDevice : public FirewireDevice
uint64_t guid, void *item);
friend int dfd_no_data_notification(void *cb_data);
friend void dfd_stream_msg(
- long unsigned int msg, long unsigned int param1,
- long unsigned int param2, void *callback_data);
+ UInt32 msg, UInt32 param1,
+ UInt32 param2, void *callback_data);
friend int dfd_tspacket_handler(
uint tsPacketCount, uint32_t **ppBuf, void *callback_data);
View
2 mythtv/libs/libmythtv/firewirechannel.cpp
@@ -8,7 +8,9 @@
#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())
View
2 mythtv/libs/libmythtv/firewiredevice.cpp
@@ -12,7 +12,9 @@
// MythTV headers
#include "linuxfirewiredevice.h"
+#if USING_OSX_FIREWIRE
#include "darwinfirewiredevice.h"
+#endif
#include "mythverbose.h"
#include "pespacket.h"

0 comments on commit 63128e2

Please sign in to comment.
Something went wrong with that request. Please try again.