64bit compilation fixes

diff --git a/modules/control/unimotion.c b/modules/control/unimotion.c
index c4195e20e012fc106424506ee22316fd37501849..6e60c1a4fb5a0aa705676edc5750a89e0a6a79c7 100644 (file)
--- a/modules/control/unimotion.c
+++ b/modules/control/unimotion.c
@@ -138,8 +138,8 @@ static int probe_sms(int kernFunc, char *servMatch, int dataType, void *data)
     io_object_t aDevice;
     io_connect_t  dataPort;
 
-    IOItemCount structureInputSize;
-    IOByteCount structureOutputSize;
+    size_t structureInputSize;
+    size_t structureOutputSize;
 
     union motion_data inputStructure;
     union motion_data *outputStructure;
@@ -189,8 +189,13 @@ static int probe_sms(int kernFunc, char *servMatch, int dataType, void *data)
     memset(&inputStructure, 0, sizeof(union motion_data));
     memset(outputStructure, 0, sizeof(union motion_data));
 
+#ifdef __LP64__
+    result = IOConnectCallStructMethod(dataPort, kernFunc, &inputStructure, 
+                structureInputSize, outputStructure, &structureOutputSize );
+#else
     result = IOConnectMethodStructureIStructureO(dataPort, kernFunc, structureInputSize,
                 &structureOutputSize, &inputStructure, outputStructure);
+#endif
 
     IOServiceClose(dataPort);
 

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 8152b4452bcf322c7ba8ed9e7178c02bd75467f4..3772cb32b25101a50cd1a1ea96ec29b715ef09ff 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -37,6 +37,9 @@
 /* BeginFullScreen, EndFullScreen */
 #include <QuickTime/QuickTime.h>
 
+/* prevent system sleep */
+#import <CoreServices/CoreServices.h>
+
 #include <vlc_keys.h>
 
 #include "intf.h"
@@ -447,6 +450,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     if( !VLCIntf || !VLCIntf->p_sys )
         return;
 
+    UInt8 UsrActivity;
     if( VLCIntf->p_sys->i_play_status == PLAYING_S )
         UpdateSystemActivity( UsrActivity );
 }