mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_input.h) Rename enum

Browse Source 
(jsonsax.c) C89_BUILD fix
This commit is contained in:
twinaphex 2015-10-11 16:29:28 +02:00
parent 4746e44992
commit e979e16721
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretro-common/formats/json/jsonsax.c
View File

@ -92,10 +92,11 @@ static void jsonx_parse_object( state_t* state )
while ( *state->json != '}' ) while ( *state->json != '}' )
{ {
const char *name = NULL;
if ( *state->json != '"' ) if ( *state->json != '"' )
longjmp( state->env, JSONSAX_MISSING_KEY ); longjmp( state->env, JSONSAX_MISSING_KEY );
const char* name = ++state->json; name = ++state->json;
for ( ;; ) for ( ;; )
{ {

21
menu/menu_input.h
View File

@ -43,6 +43,17 @@ enum menu_action
MENU_ACTION_SCROLL_UP, MENU_ACTION_SCROLL_UP,
MENU_ACTION_TOGGLE MENU_ACTION_TOGGLE
}; };
enum menu_mouse_action
{
MOUSE_ACTION_NONE = 0,
MOUSE_ACTION_BUTTON_L,
MOUSE_ACTION_BUTTON_L_TOGGLE,
MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
MOUSE_ACTION_BUTTON_R,
MOUSE_ACTION_WHEEL_UP,
MOUSE_ACTION_WHEEL_DOWN
};
enum menu_input_pointer_state enum menu_input_pointer_state
{ {
@ -79,16 +90,6 @@ enum menu_input_ctl_state
MENU_INPUT_CTL_SEARCH_START MENU_INPUT_CTL_SEARCH_START
}; };
enum mouse_action
{
MOUSE_ACTION_NONE = 0,
MOUSE_ACTION_BUTTON_L,
MOUSE_ACTION_BUTTON_L_TOGGLE,
MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
MOUSE_ACTION_BUTTON_R,
MOUSE_ACTION_WHEEL_UP,
MOUSE_ACTION_WHEEL_DOWN
};
enum menu_input_bind_mode enum menu_input_bind_mode
{ {