diff --git a/menu/menu_event.c b/menu/menu_event.c index a0b3d64d96..27c94c384e 100644 --- a/menu/menu_event.c +++ b/menu/menu_event.c @@ -35,7 +35,7 @@ #include "menu_navigation.h" #include "../configuration.h" -#include "../runloop_defines.h" +#include "../retroarch.h" #include "../tasks/tasks_internal.h" static unsigned char menu_keyboard_key_state[RETROK_LAST] = {0}; diff --git a/retroarch.c b/retroarch.c index 628cde22b2..9bcb6ac4fd 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1330,8 +1330,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) case RARCH_CTL_UNSET_IPS_PREF: rarch_ips_pref = false; break; - case RARCH_CTL_IS_PLAIN_CORE: - return (current_core_type == CORE_TYPE_PLAIN); case RARCH_CTL_IS_DUMMY_CORE: return (current_core_type == CORE_TYPE_DUMMY); case RARCH_CTL_USERNAME_SET: diff --git a/retroarch.h b/retroarch.h index 489dd3ea64..87342e02f0 100644 --- a/retroarch.h +++ b/retroarch.h @@ -26,7 +26,8 @@ #include "core_type.h" #include "core.h" -#include "runloop_defines.h" + +#define runloop_cmd_press(current_input, id) (BIT64_GET(current_input, id)) RETRO_BEGIN_DECLS @@ -42,8 +43,6 @@ enum rarch_ctl_state RARCH_CTL_IS_INITED, - RARCH_CTL_IS_PLAIN_CORE, - RARCH_CTL_IS_DUMMY_CORE, RARCH_CTL_PREINIT, diff --git a/runloop_defines.h b/runloop_defines.h deleted file mode 100644 index d57f473437..0000000000 --- a/runloop_defines.h +++ /dev/null @@ -1,22 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2017 - Daniel De Matteis - * Copyright (C) 2016-2017 - Brad Parker - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __RETROARCH_RUNLOOP_DEFINES_H -#define __RETROARCH_RUNLOOP_DEFINES_H - -#define runloop_cmd_press(current_input, id) (BIT64_GET(current_input, id)) - -#endif