[Scummvm-git-logs] scummvm master -> 9dc2820a33630df29b2583ae595ea0591bc7efd5

digitall dgturner at iee.org
Tue Aug 28 18:39:34 CEST 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9dc2820a33 MACOSX: Fix compilation with the 10.4 SDK


Commit: 9dc2820a33630df29b2583ae595ea0591bc7efd5
    https://github.com/scummvm/scummvm/commit/9dc2820a33630df29b2583ae595ea0591bc7efd5
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-28T17:39:30+01:00

Commit Message:
MACOSX: Fix compilation with the 10.4 SDK

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm


diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 4e0e11a..466356b 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -39,6 +39,10 @@
 #define NSEventModifierFlags NSUInteger
 #endif
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+typedef unsigned long NSUInteger;
+#endif
+
 // Apple added setAppleMenu in 10.5 and removed it in 10.6.
 // But as the method still exists we declare it ourselves here.
 // Yes, this works :)





More information about the Scummvm-git-logs mailing list