Merge pull request #1302 from dguzek/macOS-10-12

fix compilation on macOS 10.12
This commit is contained in:
Dan Guzek
2016-12-01 16:29:13 -05:00
committed by Jason Felds
parent 9944ac3957
commit a7d4919d83
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -208,10 +208,11 @@ MutexImpl *MakeMutex( RageMutex *pParent )
#if defined(UNIX)
#include <dlfcn.h>
#include "arch/ArchHooks/ArchHooks_Unix.h"
#elif defined(MACOSX)
typedef int clockid_t;
static const clockid_t CLOCK_REALTIME = 0;
static const clockid_t CLOCK_MONOTONIC = 1;
// commented out to allow comilation on macOS 10.12. -dguzek
//#elif defined(MACOSX)
//typedef int clockid_t;
//static const clockid_t CLOCK_REALTIME = 0;
//static const clockid_t CLOCK_MONOTONIC = 1;
#endif // On MinGW clockid_t is defined in pthread.h
namespace
{
+1 -1
View File
@@ -216,7 +216,7 @@ int main( int argc, char **argv )
// Create SMMain and make it the app delegate.
sm = [[SMMain alloc] initWithArgc:argc argv:argv];
[NSApp setDelegate:sm];
[NSApp setDelegate:static_cast<id<NSApplicationDelegate>>(sm)];
[pool release];
// Start the main event loop.