From aad3ddc7a56050b4f611c891e5d9018bff41c58b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 28 Jan 2016 06:20:44 +0100
Subject: [PATCH] Move core_poll_type to libretro_version_1.c

---
 dynamic.h            |  1 -
 libretro_version_1.c | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dynamic.h b/dynamic.h
index c368631c8a..1de23d3e0c 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -123,7 +123,6 @@ bool rarch_environment_cb(unsigned cmd, void *data);
 
 struct retro_core_t
 {
-   unsigned poll_type;
    void (*retro_init)(void);
    void (*retro_deinit)(void);
    unsigned (*retro_api_version)(void);
diff --git a/libretro_version_1.c b/libretro_version_1.c
index 125f54d950..b68abdc2f0 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -38,12 +38,13 @@
 #endif
 
 static struct retro_core_t core;
+static unsigned core_poll_type;
 static bool input_polled;
 
 static int16_t input_state_poll(unsigned port,
       unsigned device, unsigned idx, unsigned id)
 {
-   if (core.poll_type == POLL_TYPE_LATE)
+   if (core_poll_type == POLL_TYPE_LATE)
    {
       if (!input_polled)
          input_poll();
@@ -93,7 +94,7 @@ static bool retro_uninit_libretro_cbs(void *data)
 
 static void input_poll_maybe(void)
 {
-   if (core.poll_type == POLL_TYPE_NORMAL)
+   if (core_poll_type == POLL_TYPE_NORMAL)
       input_poll();
 }
 
@@ -127,7 +128,7 @@ static bool retro_init_libretro_cbs(void *data)
       return true;
 
    /* Force normal poll type for netplay. */
-   core.poll_type = POLL_TYPE_NORMAL;
+   core_poll_type = POLL_TYPE_NORMAL;
 
    if (global->netplay.is_spectate)
    {
@@ -192,7 +193,7 @@ bool core_ctl(enum core_ctl_state state, void *data)
       case CORE_CTL_SET_POLL_TYPE:
          {
             unsigned *poll_type = (unsigned*)data;
-            core.poll_type = *poll_type;
+            core_poll_type = *poll_type;
          }
          break;
       case CORE_CTL_RETRO_SYMBOLS_INIT:
@@ -314,7 +315,7 @@ bool core_ctl(enum core_ctl_state state, void *data)
          core.retro_unload_game();
          break;
       case CORE_CTL_RETRO_RUN:
-         switch (core.poll_type)
+         switch (core_poll_type)
          {
             case POLL_TYPE_EARLY:
                input_poll();
@@ -333,7 +334,7 @@ bool core_ctl(enum core_ctl_state state, void *data)
       case CORE_CTL_INIT:
          {
             settings_t *settings = config_get_ptr();
-            core.poll_type = settings->input.poll_type_behavior;
+            core_poll_type = settings->input.poll_type_behavior;
             if (!core_ctl(CORE_CTL_VERIFY_API_VERSION, NULL))
                return false;
             if (!retro_init_libretro_cbs(&retro_ctx))