From 6f84857ec3a8c530aeff0424f9764c1e282b0216 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 16 May 2015 16:42:08 +0200
Subject: [PATCH] Make rarch_main_data_get_ptr a public function

---
 runloop.c      |  5 ++++-
 runloop_data.c | 14 +++++++-------
 runloop_data.h |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/runloop.c b/runloop.c
index a6bfb2747d..0b4adf4d93 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1081,6 +1081,7 @@ int rarch_main_iterate(void)
    unsigned i;
    retro_input_t trigger_input;
    event_cmd_state_t    cmd        = {0};
+   data_runloop_t *data            = NULL;
    runloop_t *runloop              = rarch_main_get_ptr();
    int ret                         = 0;
    static retro_input_t last_input = 0;
@@ -1110,7 +1111,9 @@ int rarch_main_iterate(void)
    rarch_main_iterate_linefeed_overlay();
 #endif
    
-   if (rarch_main_data_active(runloop))
+   data = rarch_main_data_get_ptr();
+
+   if (rarch_main_data_active(data))
       rarch_main_data_iterate();
 
 #ifdef HAVE_MENU
diff --git a/runloop_data.c b/runloop_data.c
index 9b3bf5a007..df2884e8ad 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -34,7 +34,7 @@ static char data_runloop_msg[PATH_MAX_LENGTH];
 
 static struct data_runloop *g_data_runloop;
 
-static void *rarch_main_data_get_ptr(void)
+data_runloop_t *rarch_main_data_get_ptr(void)
 {
    return g_data_runloop;
 }
@@ -60,7 +60,7 @@ static void data_runloop_thread_deinit(data_runloop_t *runloop)
 
 void rarch_main_data_deinit(void)
 {
-   data_runloop_t *runloop = (data_runloop_t*)rarch_main_data_get_ptr();
+   data_runloop_t *runloop = rarch_main_data_get_ptr();
 
    if (!runloop)
       return;
@@ -80,7 +80,7 @@ void rarch_main_data_deinit(void)
 
 void rarch_main_data_free(void)
 {
-   data_runloop_t *runloop = (data_runloop_t*)rarch_main_data_get_ptr();
+   data_runloop_t *runloop = rarch_main_data_get_ptr();
 
    if (runloop)
       free(runloop);
@@ -203,7 +203,7 @@ static void data_thread_loop(void *data)
 #ifdef HAVE_THREADS
 static void rarch_main_data_thread_init(void)
 {
-   data_runloop_t *runloop  = (data_runloop_t*)rarch_main_data_get_ptr();
+   data_runloop_t *runloop  = rarch_main_data_get_ptr();
 
    if (!runloop)
       return;
@@ -236,7 +236,7 @@ error:
 
 void rarch_main_data_iterate(void)
 {
-   data_runloop_t *runloop      = (data_runloop_t*)rarch_main_data_get_ptr();
+   data_runloop_t *runloop      = rarch_main_data_get_ptr();
    settings_t     *settings     = config_get_ptr();
    
    (void)settings;
@@ -302,7 +302,7 @@ void rarch_main_data_clear_state(void)
 
 void rarch_main_data_init_queues(void)
 {
-   data_runloop_t *runloop = (data_runloop_t*)rarch_main_data_get_ptr();
+   data_runloop_t *runloop = rarch_main_data_get_ptr();
 #ifdef HAVE_NETWORKING
    if (!runloop->http.msg_queue)
       rarch_assert(runloop->http.msg_queue       = msg_queue_new(8));
@@ -323,7 +323,7 @@ void rarch_main_data_msg_queue_push(unsigned type,
 {
    char new_msg[PATH_MAX_LENGTH];
    msg_queue_t *queue = NULL;
-   data_runloop_t *runloop = (data_runloop_t*)rarch_main_data_get_ptr();
+   data_runloop_t *runloop = rarch_main_data_get_ptr();
 
    switch(type)
    {
diff --git a/runloop_data.h b/runloop_data.h
index 4b9711fcbc..a6050c1d12 100644
--- a/runloop_data.h
+++ b/runloop_data.h
@@ -165,6 +165,8 @@ void rarch_main_data_init_queues(void);
 
 bool rarch_main_data_active(data_runloop_t *runloop);
 
+data_runloop_t *rarch_main_data_get_ptr(void);
+
 #ifdef __cplusplus
 }
 #endif