From c60ce5c720c7e8c50ebe558abd0d0555eefb79a6 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 5 Mar 2014 03:26:01 +0100
Subject: [PATCH] Fixup logging interface/Set min OS version to 10.6

---
 Makefile.libretro   |  2 +-
 libretro/libretro.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 426bda6..db398e2 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -43,7 +43,7 @@ ifeq ($(platform), unix)
    PLATFORM_DEFINES := -DHAVE_ZLIB
 else ifeq ($(platform), osx)
    TARGET := $(TARGET_NAME)_libretro.dylib
-   fpic := -fPIC
+   fpic := -fPIC -mmacosx-version-min=10.6
    SHARED := -dynamiclib -lz
    ENDIANNESS_DEFINES := -DLSB_FIRST
    PLATFORM_DEFINES := -DHAVE_ZLIB
diff --git a/libretro/libretro.c b/libretro/libretro.c
index 28440d1..087861f 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -71,10 +71,15 @@ static retro_audio_sample_batch_t audio_cb;
  ************************************/
 #define CHUNKSIZE   (0x10000)
 
-void error(char * msg, ...)
+void error(char * fmt, ...)
 {
+   char buffer[256];
+   va_list ap;
+   va_start(ap, fmt);
+   vsprintf(buffer, fmt, ap);
    if (log_cb)
-      log_cb(RETRO_LOG_ERROR, msg);
+      log_cb(RETRO_LOG_ERROR, "%s\n", buffer);
+   va_end(ap);
 }
 
 int load_archive(char *filename, unsigned char *buffer, int maxsize, char *extension)
@@ -964,9 +969,10 @@ void retro_init(void)
    level = 1;
    environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
 
-   environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log);
-   if (log.log)
+   if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
       log_cb = log.log;
+   else
+      log_cb = NULL;
 
 #ifdef FRONTEND_SUPPORTS_RGB565
    rgb565 = RETRO_PIXEL_FORMAT_RGB565;