From 83f1b28f985f58fadfbd130b13b023e04f71485e Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sun, 22 Sep 2019 10:54:01 +0200
Subject: [PATCH] Revert "(Cocoa) Move nsview_get_ptr and nsview_set_ptr to
 cocoa_gl_ctx.m"

This reverts commit 4f564360e7ba3df82e496d8dec8ca1a0dc3d4261.
---
 gfx/drivers_context/cocoa_gl_ctx.m | 25 +++----------------------
 ui/drivers/cocoa/cocoa_common.h    |  4 ----
 ui/drivers/cocoa/cocoa_common.m    | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index ac5172e04b..b427b461fd 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -93,27 +93,8 @@ static unsigned g_major  = 0;
 @end
 #endif
 
-static CocoaView* g_instance;
-
-void *nsview_set_ptr(void *inst)
-{
-   g_instance = (BRIDGE void*)inst;
-   return (BRIDGE void *)g_instance;
-}
-
-void *nsview_get_ptr(void)
-{
-#if defined(HAVE_COCOA)
-    video_driver_display_type_set(RARCH_DISPLAY_OSX);
-    video_driver_display_set(0);
-    video_driver_display_userdata_set((uintptr_t)g_instance);
-#elif defined(HAVE_COCOA_METAL)
-    video_driver_display_type_set(RARCH_DISPLAY_OSX);
-    video_driver_display_set(0);
-    video_driver_display_userdata_set((uintptr_t)g_instance);
-#endif
-    return (BRIDGE void *)g_instance;
-}
+/* forward declaration */
+void *nsview_get_ptr(void);
 
 #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
 static NSOpenGLPixelFormat* g_format;
@@ -186,7 +167,7 @@ void *glkitview_init(void)
 
    return (BRIDGE void *)((GLKView*)g_view);
 #else
-   return nsview_get_ptr();
+    return nsview_get_ptr();
 #endif
 }
 
diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h
index 7f03c4e82a..f7aeb94008 100644
--- a/ui/drivers/cocoa/cocoa_common.h
+++ b/ui/drivers/cocoa/cocoa_common.h
@@ -144,8 +144,4 @@ extern apple_frontend_settings_t apple_frontend_settings;
 
 void *get_chosen_screen(void);
 
-void *nsview_set_ptr(void *inst);
-
-void *nsview_get_ptr(void);
-
 #endif
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index 3037a1f13a..194e74b44e 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -31,6 +31,28 @@
 #import "WebServer.h"
 #endif
 
+static CocoaView* g_instance;
+
+void *nsview_set_ptr(void *inst)
+{
+   g_instance = (BRIDGE void*)inst;
+   return (BRIDGE void *)g_instance;
+}
+
+void *nsview_get_ptr(void)
+{
+#if defined(HAVE_COCOA)
+    video_driver_display_type_set(RARCH_DISPLAY_OSX);
+    video_driver_display_set(0);
+    video_driver_display_userdata_set((uintptr_t)g_instance);
+#elif defined(HAVE_COCOA_METAL)
+    video_driver_display_type_set(RARCH_DISPLAY_OSX);
+    video_driver_display_set(0);
+    video_driver_display_userdata_set((uintptr_t)g_instance);
+#endif
+    return (BRIDGE void *)g_instance;
+}
+
 /* forward declarations */
 void cocoagl_gfx_ctx_update(void);
 void *glkitview_init(void);