64bit compilation fixes
authorFelix Paul Kühne <fkuehne@videolan.org>
Sun, 4 Jan 2009 14:19:12 +0000 (15:19 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Sun, 4 Jan 2009 14:19:12 +0000 (15:19 +0100)
modules/control/unimotion.c
modules/gui/macosx/vout.m

index c4195e2..6e60c1a 100644 (file)
@@ -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);
 
index 8152b44..3772cb3 100644 (file)
@@ -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 );
 }