[Scummvm-git-logs] scummvm master -> cc1e43bd2d4b88218337b2318fab0c0b67d66c78

[criezy]

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:
cc1e43bd2d IOS: Disable code using safeAreaInsets when compiling with iOS SDK 10 or below


Commit: cc1e43bd2d4b88218337b2318fab0c0b67d66c78
    https://github.com/scummvm/scummvm/commit/cc1e43bd2d4b88218337b2318fab0c0b67d66c78
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-10-28T18:08:38Z

Commit Message:
IOS: Disable code using safeAreaInsets when compiling with iOS SDK 10 or below

Changed paths:
    backends/platform/ios7/ios7_video.mm


diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm
index 955f54a..8e3edb3 100644
--- a/backends/platform/ios7/ios7_video.mm
+++ b/backends/platform/ios7/ios7_video.mm
@@ -801,6 +801,12 @@ uint getSizeNextPOT(uint size) {
 #endif
 
 -(void)adjustViewFrameForSafeArea {
+	// The code below does not quite compile with SDKs older than 11.0.
+	// warning: instance method '-safeAreaInsets' not found (return type defaults to 'id')
+	// error: no viable conversion from 'id' to 'UIEdgeInsets'
+	// So for now disable this code when compiled with an older SDK, which means it is only
+	// available when running on iOS 11+ if it has been compiled on iOS 11+
+#ifdef __IPHONE_11_0
 #if __has_builtin(__builtin_available)
     if ( @available(iOS 11,*) ) {
 #else
@@ -819,6 +825,7 @@ uint getSizeNextPOT(uint size) {
         }
         self.frame = newFrame;
     }
+#endif
 }
 
 - (void)setViewTransformation {