mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1839 from heuripedes/master

Browse Source 
Fixes
This commit is contained in:
Twinaphex 2015-06-22 01:34:24 +02:00
commit 51294a78c4
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/drivers/linuxraw_input.c
View File

@ -293,7 +293,7 @@ static void linuxraw_keyboard_mapping_set_block(void *data, bool value)
{
linuxraw_input_t *linuxraw = (linuxraw_input_t*)data;
if (!linuxraw)
return false;
return;
linuxraw->blocked = value;
}

3
retroarch.c
View File

@ -59,6 +59,9 @@
#include "menu/menu_input.h"
#endif
char orig_savestate_dir[PATH_MAX_LENGTH];
char orig_savefile_dir[PATH_MAX_LENGTH];
/* Descriptive names for options without short variant. Please keep the name in
sync with the option name. Order does not matter. */
enum {

4
retroarch.h
View File

@ -172,8 +172,8 @@ void set_paths_redirect(const char *path);
int rarch_info_get_capabilities(enum rarch_capabilities type, char *s, size_t len);
char orig_savestate_dir[PATH_MAX_LENGTH];
char orig_savefile_dir[PATH_MAX_LENGTH];
extern char orig_savestate_dir[PATH_MAX_LENGTH];
extern char orig_savefile_dir[PATH_MAX_LENGTH];
#ifdef __cplusplus
}

12
runloop_data.h
View File

@ -46,7 +46,7 @@ enum runloop_data_type
};
#ifdef HAVE_NETWORKING
enum
enum http_status_enum
{
HTTP_STATUS_POLL = 0,
HTTP_STATUS_CONNECTION_TRANSFER,
@ -54,7 +54,7 @@ enum
HTTP_STATUS_TRANSFER,
HTTP_STATUS_TRANSFER_PARSE,
HTTP_STATUS_TRANSFER_PARSE_FREE,
} http_status_enum;
};
typedef struct http_handle
{
@ -90,7 +90,7 @@ typedef struct nbio_image_handle
unsigned status;
} nbio_image_handle_t;
enum
enum nbio_image_status_enum
{
NBIO_IMAGE_STATUS_POLL = 0,
NBIO_IMAGE_STATUS_TRANSFER,
@ -98,15 +98,15 @@ enum
NBIO_IMAGE_STATUS_PROCESS_TRANSFER,
NBIO_IMAGE_STATUS_PROCESS_TRANSFER_PARSE,
NBIO_IMAGE_STATUS_TRANSFER_PARSE_FREE,
} nbio_image_status_enum;
};
enum
enum nbio_status_enum
{
NBIO_STATUS_POLL = 0,
NBIO_STATUS_TRANSFER,
NBIO_STATUS_TRANSFER_PARSE,
NBIO_STATUS_TRANSFER_PARSE_FREE,
} nbio_status_enum;
};
typedef struct nbio_handle
{