From e8528d83e082f94adc51785c20e9d2da85a3f8e2 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Mon, 26 Jan 2015 11:17:38 +0100
Subject: [PATCH] (Apple) Build fixes

---
 apple/iOS/menu.m                  |  2 +-
 apple/iOS/platform.m              |  2 +-
 frontend/drivers/platform_apple.c |  2 +-
 menu/drivers/ios.c                |  2 +-
 menu/menu_entries_cbs.c           | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m
index 121dfb7844..08611a7209 100644
--- a/apple/iOS/menu.m
+++ b/apple/iOS/menu.m
@@ -25,7 +25,7 @@
 
 #include "../../menu/menu.h"
 #include "../../menu/menu_entries.h"
-#include "../../menu/drivers_display/shared.h"
+#include "../../menu/drivers/shared.h"
 
 /*********************************************/
 /* RunActionSheet                            */
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index a4013e5c03..b94255833a 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -27,7 +27,7 @@
 #include "bluetooth/btdynamic.h"
 #include "bluetooth/btpad.h"
 
-#include "../../menu/drivers_display/ios.h"
+#include "../../menu/drivers/ios.h"
 
 id<RetroArch_Platform> apple_platform;
 
diff --git a/frontend/drivers/platform_apple.c b/frontend/drivers/platform_apple.c
index b991126e86..2f5acd2639 100644
--- a/frontend/drivers/platform_apple.c
+++ b/frontend/drivers/platform_apple.c
@@ -20,7 +20,7 @@
 #include "../frontend.h"
 #include "../../runloop.h"
 #ifdef IOS
-#include "../../menu/drivers_display/ios.h"
+#include "../../menu/drivers/ios.h"
 #endif
 
 #include <stdint.h>
diff --git a/menu/drivers/ios.c b/menu/drivers/ios.c
index 2ce053b3be..7bc28279b1 100644
--- a/menu/drivers/ios.c
+++ b/menu/drivers/ios.c
@@ -25,7 +25,7 @@
 #include "ios.h"
 #include "../menu_input.h"
 
-#ifdef 1
+#if 1
 static int ios_entry_iterate(unsigned action)
 {
    ios_handle_t *ios = NULL;
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 63247e263e..274864b9d7 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -2684,7 +2684,7 @@ static int action_bind_up_or_down_generic(unsigned type, const char *label,
    return 0;
 }
 
-int action_refresh_default(file_list_t *list, file_list_t *menu_list)
+static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
 {
    int ret = menu_entries_deferred_push(list, menu_list);
    driver.menu->need_refresh = false;
@@ -2820,13 +2820,13 @@ static int action_iterate_info(const char *label, unsigned action)
    }
    else
    {
-      const char *label = NULL;
+      const char *lbl = NULL;
       menu_list_get_at_offset(driver.menu->menu_list->selection_buf,
-            driver.menu->selection_ptr, NULL, &label,
+            driver.menu->selection_ptr, NULL, &lbl,
             &info_type);
 
-      if (label)
-         strlcpy(needle, label, sizeof(needle));
+      if (lbl)
+         strlcpy(needle, lbl, sizeof(needle));
    }
 
    setting_data_get_description(needle, msg, sizeof(msg));