From 4f8a3a9054d1e70e259e70631b3f5e017acc440f Mon Sep 17 00:00:00 2001 From: Leo Franchi <lfranchi@kde.org> Date: Sun, 13 Sep 2015 12:16:18 -0700 Subject: [PATCH] Build on Q_OS_MAC64 --- src/tomahawk/main.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/tomahawk/main.cpp b/src/tomahawk/main.cpp index dbcbee32d..edc340b97 100644 --- a/src/tomahawk/main.cpp +++ b/src/tomahawk/main.cpp @@ -30,6 +30,12 @@ #ifdef Q_OS_MAC #include "TomahawkApp_Mac.h" +#endif + +#ifdef Q_OS_MAC64 + #include <Carbon/Carbon.h> + static pascal OSErr appleEventHandler( const AppleEvent*, AppleEvent*, void* ); +#elif defined Q_OS_MAC32 #include </System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/Headers/AppleEvents.h> static pascal OSErr appleEventHandler( const AppleEvent*, AppleEvent*, long ); #endif @@ -250,8 +256,11 @@ main( int argc, char *argv[] ) #ifdef Q_OS_MAC -static pascal OSErr -appleEventHandler( const AppleEvent* e, AppleEvent*, long ) +#ifdef Q_OS_MAC64 +static pascal OSErr appleEventHandler( const AppleEvent* e, AppleEvent*, void* ) +#elif defined Q_OS_MAC32 +static pascal OSErr appleEventHandler( const AppleEvent* e, AppleEvent*, long ) +#endif //Q_OS_MAC64/32 { OSType id = typeWildCard; AEGetAttributePtr( e, keyEventIDAttr, typeType, 0, &id, sizeof( id ), 0 );