From 17a57443aea26bf51cc7992049f2503e6cecb672 Mon Sep 17 00:00:00 2001
From: Johannes Schickel <lordhoto@scummvm.org>
Date: Thu, 7 Jan 2016 12:30:19 +0100
Subject: [PATCH] IOS7: Use standard include guard names.

---
 backends/platform/ios7/iOS7AppDelegate.h           | 5 +++++
 backends/platform/ios7/iOS7ScummVMViewController.h | 5 +++++
 backends/platform/ios7/ios7_common.h               | 4 ++--
 backends/platform/ios7/ios7_keyboard.h             | 4 ++--
 backends/platform/ios7/ios7_osys_main.h            | 4 ++--
 backends/platform/ios7/ios7_video.h                | 4 ++--
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h
index a34ad9bb1808..224989880d87 100644
--- a/backends/platform/ios7/iOS7AppDelegate.h
+++ b/backends/platform/ios7/iOS7AppDelegate.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
+
 #import <UIKit/UIKit.h>
 
 @class iPhoneView;
@@ -31,3 +34,5 @@
 + (iPhoneView *)iPhoneView;
 
 @end
+
+#endif
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/iOS7ScummVMViewController.h
index 0322bc6f7fe3..54eac142a606 100644
--- a/backends/platform/ios7/iOS7ScummVMViewController.h
+++ b/backends/platform/ios7/iOS7ScummVMViewController.h
@@ -20,9 +20,14 @@
  *
  */
 
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
+
 #import <UIKit/UIKit.h>
 
 
 @interface iOS7ScummVMViewController : UIViewController
 
 @end
+
+#endif
diff --git a/backends/platform/ios7/ios7_common.h b/backends/platform/ios7/ios7_common.h
index a32a59a541be..12740d4ae9df 100644
--- a/backends/platform/ios7/ios7_common.h
+++ b/backends/platform/ios7/ios7_common.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H
-#define BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_COMMON_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_COMMON_H
 
 #include "graphics/surface.h"
 
diff --git a/backends/platform/ios7/ios7_keyboard.h b/backends/platform/ios7/ios7_keyboard.h
index ddd8f436e572..1f917cc8c511 100644
--- a/backends/platform/ios7/ios7_keyboard.h
+++ b/backends/platform/ios7/ios7_keyboard.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
-#define BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H
 
 #include <UIKit/UIKit.h>
 #include <UIKit/UITextView.h>
diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index eadb49e5ac61..4ad65288544a 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H
-#define BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_OSYS_MAIN_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_OSYS_MAIN_H
 
 #include "graphics/surface.h"
 #include "ios7_common.h"
diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h
index ab261a977bd7..b530bad5a206 100644
--- a/backends/platform/ios7/ios7_video.h
+++ b/backends/platform/ios7/ios7_video.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H
-#define BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_VIDEO_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_VIDEO_H
 
 #include <UIKit/UIKit.h>
 #include <Foundation/Foundation.h>