From 8fc03872c4a7d79f984a08163515f206f61ce4d4 Mon Sep 17 00:00:00 2001
From: Johannes Schickel <lordhoto@scummvm.org>
Date: Thu, 7 Jan 2016 12:31:49 +0100
Subject: [PATCH] IOS7: Use #include instead of #import.

We always use #include. #import is a nice ObjC feature (in theory), but can
lead to odd results in corner cases.
---
 backends/platform/ios7/iOS7AppDelegate.h            | 2 +-
 backends/platform/ios7/iOS7AppDelegate.mm           | 6 +++---
 backends/platform/ios7/iOS7ScummVMViewController.h  | 2 +-
 backends/platform/ios7/iOS7ScummVMViewController.mm | 2 +-
 backends/platform/ios7/ios7_osys_video.mm           | 2 +-
 backends/platform/ios7/ios7_video.h                 | 2 +-
 backends/platform/ios7/ios7_video.mm                | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h
index 224989880d8..08696c7b617 100644
--- a/backends/platform/ios7/iOS7AppDelegate.h
+++ b/backends/platform/ios7/iOS7AppDelegate.h
@@ -23,7 +23,7 @@
 #ifndef BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
 #define BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
 
-#import <UIKit/UIKit.h>
+#include <UIKit/UIKit.h>
 
 @class iPhoneView;
 
diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/iOS7AppDelegate.mm
index 9d1cb9ed44a..dbc81725a47 100644
--- a/backends/platform/ios7/iOS7AppDelegate.mm
+++ b/backends/platform/ios7/iOS7AppDelegate.mm
@@ -21,9 +21,9 @@
  */
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
-#import "iOS7AppDelegate.h"
-#import "iOS7ScummVMViewController.h"
-#import "ios7_video.h"
+#include "iOS7AppDelegate.h"
+#include "iOS7ScummVMViewController.h"
+#include "ios7_video.h"
 
 @implementation iOS7AppDelegate {
 	UIWindow *_window;
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/iOS7ScummVMViewController.h
index 54eac142a60..39168aaee7d 100644
--- a/backends/platform/ios7/iOS7ScummVMViewController.h
+++ b/backends/platform/ios7/iOS7ScummVMViewController.h
@@ -23,7 +23,7 @@
 #ifndef BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
 #define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
 
-#import <UIKit/UIKit.h>
+#include <UIKit/UIKit.h>
 
 
 @interface iOS7ScummVMViewController : UIViewController
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.mm b/backends/platform/ios7/iOS7ScummVMViewController.mm
index f92fd0115c8..8dfa0122ddc 100644
--- a/backends/platform/ios7/iOS7ScummVMViewController.mm
+++ b/backends/platform/ios7/iOS7ScummVMViewController.mm
@@ -20,7 +20,7 @@
  *
  */
 
-#import "iOS7ScummVMViewController.h"
+#include "iOS7ScummVMViewController.h"
 
 
 @implementation iOS7ScummVMViewController
diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index 0d183ce8342..908d0bf23ca 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -27,7 +27,7 @@
 #include "ios7_video.h"
 
 #include "graphics/conversion.h"
-#import "iOS7AppDelegate.h"
+#include "iOS7AppDelegate.h"
 
 @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate>
 @end
diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h
index b530bad5a20..d2161d6e7a2 100644
--- a/backends/platform/ios7/ios7_video.h
+++ b/backends/platform/ios7/ios7_video.h
@@ -35,7 +35,7 @@
 #include "ios7_common.h"
 
 #include "common/list.h"
-#import "graphics/scaler.h"
+#include "graphics/scaler.h"
 
 typedef struct {
 	GLfloat x, y;
diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm
index 2cfc3e05f7c..337d4603f2a 100644
--- a/backends/platform/ios7/ios7_video.mm
+++ b/backends/platform/ios7/ios7_video.mm
@@ -27,7 +27,7 @@
 
 #include "graphics/colormasks.h"
 #include "common/system.h"
-#import "iOS7AppDelegate.h"
+#include "iOS7AppDelegate.h"
 
 static int g_needsScreenUpdate = 0;