From 49f9fbd00cfd2777adf09c5e55fa45f4c32a214f Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Fri, 13 Mar 2015 03:47:25 +0100
Subject: [PATCH] (OSX) Uses CFTemporaryDirectory now too for extraction
 directory

---
 apple/common/CFExtensions.h       |  2 --
 apple/common/CFExtensions.m       | 15 +--------------
 frontend/drivers/platform_apple.c |  7 ++++---
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/apple/common/CFExtensions.h b/apple/common/CFExtensions.h
index 797d119fd7..e75e3e9f8b 100644
--- a/apple/common/CFExtensions.h
+++ b/apple/common/CFExtensions.h
@@ -63,8 +63,6 @@ typedef enum
 void CFSearchPathForDirectoriesInDomains(unsigned flags,
       unsigned domain_mask, unsigned expand_tilde, char *buf, size_t sizeof_buf);
 
-#ifdef IOS
 void CFTemporaryDirectory(char *buf, size_t sizeof_buf);
-#endif
 
 #endif
diff --git a/apple/common/CFExtensions.m b/apple/common/CFExtensions.m
index f9d6bfb4ae..b55aa80055 100644
--- a/apple/common/CFExtensions.m
+++ b/apple/common/CFExtensions.m
@@ -63,24 +63,11 @@ static NSSearchPathDomainMask NSConvertDomainFlagsCF(unsigned flags)
     return 0;
 }
 
-#ifdef IOS
-NS_INLINE CF_RETURNS_RETAINED CFStringRef CFBridgingRetainStringRefCompat(id X)
-{
-#if __has_feature(objc_arc)
-    return (__bridge_retained CFStringRef)X;
-#else
-    return (CFStringRef)X;
-#endif
-}
-
 void CFTemporaryDirectory(char *buf, size_t sizeof_buf)
 {
-    CFStringRef path = (CFStringRef)(CFBridgingRetainStringRefCompat(NSTemporaryDirectory()));
-    
+    CFStringRef path = (CFStringRef)NSTemporaryDirectory();
     CFStringGetCString(path, buf, sizeof_buf, kCFStringEncodingUTF8);
-    CFRelease(path);
 }
-#endif
 
 void CFSearchPathForDirectoriesInDomains(unsigned flags,
         unsigned domain_mask, unsigned expand_tilde,
diff --git a/frontend/drivers/platform_apple.c b/frontend/drivers/platform_apple.c
index 8ea09461c9..eb62ffe2ea 100644
--- a/frontend/drivers/platform_apple.c
+++ b/frontend/drivers/platform_apple.c
@@ -66,12 +66,13 @@ static void frontend_apple_get_environment_settings(int *argc, char *argv[],
    fill_pathname_join(g_defaults.cheats_dir, home_dir_buf, "cht", sizeof(g_defaults.cheats_dir));
    strlcpy(g_defaults.sram_dir, g_defaults.system_dir, sizeof(g_defaults.sram_dir));
    strlcpy(g_defaults.savestate_dir, g_defaults.system_dir, sizeof(g_defaults.savestate_dir));
-#ifdef IOS
+    
    CFTemporaryDirectory(temp_dir, sizeof(temp_dir));
    strlcpy(g_defaults.extraction_dir, temp_dir, sizeof(g_defaults.extraction_dir));
-   
+    
    fill_pathname_join(g_defaults.shader_dir, home_dir_buf, "shaders_glsl", sizeof(g_defaults.shader_dir));
-#elif defined(OSX)
+    
+#if defined(OSX)
    fill_pathname_join(g_defaults.shader_dir, home_dir_buf, "shaders_cg", sizeof(g_defaults.shader_dir));
     fill_pathname_join(g_defaults.audio_filter_dir, home_dir_buf, "audio_filters", sizeof(g_defaults.audio_filter_dir));
     fill_pathname_join(g_defaults.video_filter_dir, home_dir_buf, "video_filters", sizeof(g_defaults.video_filter_dir));