Commit 5bae799b authored by Sam Lantinga's avatar Sam Lantinga

Temporary workaround for building on 64-bit Mac OS X

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403601
parent 6c267941
...@@ -20,10 +20,12 @@ ...@@ -20,10 +20,12 @@
slouken@libsdl.org slouken@libsdl.org
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_timer.h"
#include "SDL_cocoavideo.h" #include "SDL_cocoavideo.h"
#include "../../events/SDL_events_c.h" #include "../../events/SDL_events_c.h"
/* setAppleMenu disappeared from the headers in 10.4 */ /* setAppleMenu disappeared from the headers in 10.4 */
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
@interface NSApplication(NSAppleMenu) @interface NSApplication(NSAppleMenu)
...@@ -165,6 +167,8 @@ Cocoa_PumpEvents(_THIS) ...@@ -165,6 +167,8 @@ Cocoa_PumpEvents(_THIS)
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
/* Update activity every 30 seconds to prevent screensaver */ /* Update activity every 30 seconds to prevent screensaver */
/* FIXME: This define isn't available with 64-bit Mac OS X? */
#ifdef UsrActivity
if (_this->suspend_screensaver) { if (_this->suspend_screensaver) {
SDL_VideoData *data = (SDL_VideoData *)_this->driverdata; SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
Uint32 now = SDL_GetTicks(); Uint32 now = SDL_GetTicks();
...@@ -174,6 +178,7 @@ Cocoa_PumpEvents(_THIS) ...@@ -174,6 +178,7 @@ Cocoa_PumpEvents(_THIS)
data->screensaver_activity = now; data->screensaver_activity = now;
} }
} }
#endif
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
while ([NSApp isRunning]) { while ([NSApp isRunning]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment