From b26b68244faed77545b0296807069ea346c33519 Mon Sep 17 00:00:00 2001
From: retro-wertz <retro-wertz@users.noreply.github.com>
Date: Tue, 29 Aug 2017 19:16:37 +0800
Subject: [PATCH] Update libretro-common files

---
 .../libretro/libretro-common/compat/compat_snprintf.c     | 4 ++--
 .../libretro-common/include/streams/memory_stream.h       | 8 +++++++-
 .../libretro/libretro-common/streams/memory_stream.c      | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/drivers/libretro/libretro-common/compat/compat_snprintf.c b/src/drivers/libretro/libretro-common/compat/compat_snprintf.c
index 052fe5e..8baa56a 100644
--- a/src/drivers/libretro/libretro-common/compat/compat_snprintf.c
+++ b/src/drivers/libretro/libretro-common/compat/compat_snprintf.c
@@ -30,7 +30,7 @@
 
 /* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 */
 
-int vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
+int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list ap)
 {
    int count = -1;
 
@@ -46,7 +46,7 @@ int vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
    return count;
 }
 
-int snprintf(char *outBuf, size_t size, const char *format, ...)
+int c99_snprintf_retro__(char *outBuf, size_t size, const char *format, ...)
 {
    int count;
    va_list ap;
diff --git a/src/drivers/libretro/libretro-common/include/streams/memory_stream.h b/src/drivers/libretro/libretro-common/include/streams/memory_stream.h
index 5f196ea..dca8e7a 100644
--- a/src/drivers/libretro/libretro-common/include/streams/memory_stream.h
+++ b/src/drivers/libretro/libretro-common/include/streams/memory_stream.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2017 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (memory_stream.h).
@@ -26,6 +26,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 typedef struct memstream memstream_t;
 
 memstream_t *memstream_open(unsigned writing);
@@ -52,4 +56,6 @@ void memstream_set_buffer(uint8_t *buffer, size_t size);
 
 size_t memstream_get_last_size(void);
 
+RETRO_END_DECLS
+
 #endif
diff --git a/src/drivers/libretro/libretro-common/streams/memory_stream.c b/src/drivers/libretro/libretro-common/streams/memory_stream.c
index 2cc79a9..31f0457 100644
--- a/src/drivers/libretro/libretro-common/streams/memory_stream.c
+++ b/src/drivers/libretro/libretro-common/streams/memory_stream.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/* Copyright  (C) 2010-2017 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (memory_stream.c).
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../include/streams/memory_stream.h"
+#include <streams/memory_stream.h>
 
 static uint8_t* g_buffer     = NULL;
 static size_t g_size         = 0;
@@ -41,7 +41,7 @@ struct memstream
 
 static void memstream_update_pos(memstream_t *stream)
 {
-   if (stream->ptr > stream->max_ptr)
+   if (stream && stream->ptr > stream->max_ptr)
       stream->max_ptr = stream->ptr;
 }