Merge pull request #325 from retro-wertz/SysPrintf_to_retro_log

SysPrintf to retro_log and silence some warnings

3 files changed, 16 insertions, 2 deletions

diff --git a/frontend/libretro.c b/frontend/libretro.c
index e48069a..b8d17ab 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -2286,3 +2286,15 @@ int usleep (unsigned long us)
    sceKernelDelayThread(us);
 }
 #endif
+
+void SysPrintf(const char *fmt, ...) {
+	va_list list;
+	char msg[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	if (log_cb)
+		log_cb(RETRO_LOG_INFO, "%s", msg);
+}
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index bdc214f..6513e1c 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -663,7 +663,7 @@ struct retro_core_option_definition option_defs_us[] = {
    },
 #endif /* DRC_DISABLE */
 
-   { NULL, NULL, NULL, { NULL, NULL }, NULL },
+   { NULL, NULL, NULL, { {0} }, NULL },
 };
 
 /* RETRO_LANGUAGE_JAPANESE */
@@ -1183,7 +1183,7 @@ struct retro_core_option_definition option_defs_tr[] = {
    },
 #endif /* DRC_DISABLE */
 
-   { NULL, NULL, NULL, { NULL, NULL }, NULL },
+   { NULL, NULL, NULL, { {0} }, NULL },
 };
 
 
diff --git a/frontend/main.c b/frontend/main.c
index 860dec0..c0bfd0f 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -795,6 +795,7 @@ int emu_load_state(int slot)
 	return LoadState(fname);
 }
 
+#ifndef HAVE_LIBRETRO
 #ifndef ANDROID
 
 void SysPrintf(const char *fmt, ...) {
@@ -819,6 +820,7 @@ void SysPrintf(const char *fmt, ...) {
 }
 
 #endif
+#endif /* HAVE_LIBRETRO */
 
 void SysMessage(const char *fmt, ...) {
 	va_list list;