CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-17 15:59:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
sergiobenrocha2 2014-07-11 17:44:49 -03:00
commit 4cb9a70592
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/platform/platform_android.c
View File

@ -483,7 +483,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
if (*argv && *argv)
if (argv && *argv)
strlcpy(config_path, argv, sizeof(config_path));
(*env)->ReleaseStringUTFChars(env, jstr, argv);
@ -522,7 +522,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
*core_path = '\0';
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
if (*argv && *argv)
if (argv && *argv)
strlcpy(core_path, argv, sizeof(core_path));
(*env)->ReleaseStringUTFChars(env, jstr, argv);
@ -541,7 +541,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
if (*argv && *argv)
if (argv && *argv)
strlcpy(path, argv, sizeof(path));
(*env)->ReleaseStringUTFChars(env, jstr, argv);
@ -563,7 +563,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
if (*argv && *argv)
if (argv && *argv)
strlcpy(path, argv, sizeof(path));
(*env)->ReleaseStringUTFChars(env, jstr, argv);

9
gfx/lima_gfx.c
View File

@ -493,9 +493,6 @@ static void lima_init_font(lima_video_t *vid, const char *font_path, unsigned fo
}
static void lima_render_msg(lima_video_t *vid, const char *msg) {
struct font_output_list out;
struct font_output *head;
unsigned req_size;
limare_data_t *lima = vid->lima;
@ -907,12 +904,12 @@ static void lima_set_texture_enable(void *data, bool state, bool full_screen) {
vid->menu_active = state;
}
static void lima_set_osd_msg(void *data, const char *msg, void *userdata) {
lima_video_t *vid = data;
static void lima_set_osd_msg(void *data, const char *msg, const struct font_params *params) {
(void)data;
/* TODO: what does this do? */
(void)msg;
(void)userdata;
(void)params;
}
static void lima_show_mouse(void *data, bool state) {