Update libretro-common

libretro-common/include/boolean.h

@@ -25,7 +25,7 @@
 
 #ifndef __cplusplus
 
-#if defined(_MSC_VER) && !defined(SN_TARGET_PS3)
+#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined(SN_TARGET_PS3)
 /* Hack applied for MSVC when compiling in C89 mode as it isn't C99 compliant. */
 #define bool unsigned char
 #define true 1

libretro-common/include/libretro.h

@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 #ifndef __cplusplus
-#if defined(_MSC_VER) && !defined(SN_TARGET_PS3)
+#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined(SN_TARGET_PS3)
 /* Hack applied for MSVC when compiling in C89 mode
  * as it isn't C99-compliant. */
 #define bool unsigned char
@@ -270,6 +270,7 @@ enum retro_language
    RETRO_LANGUAGE_ESPERANTO           = 13,
    RETRO_LANGUAGE_POLISH              = 14,
    RETRO_LANGUAGE_VIETNAMESE          = 15,
+   RETRO_LANGUAGE_ARABIC              = 16,
    RETRO_LANGUAGE_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */
@@ -375,6 +376,10 @@ enum retro_key
    RETROK_x              = 120,
    RETROK_y              = 121,
    RETROK_z              = 122,
+   RETROK_LEFTBRACE      = 123,
+   RETROK_BAR            = 124,
+   RETROK_RIGHTBRACE     = 125,
+   RETROK_TILDE          = 126,
    RETROK_DELETE         = 127,
 
    RETROK_KP0            = 256,
@@ -1108,6 +1113,15 @@ struct retro_led_interface
     retro_set_led_state_t set_led_state;
 };
 
+#define RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE (47 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* int * --
+                                            * Queries the frontend if audio and video are enabled or not.
+                                            * If not enabled, the frontend will discard the audio or video,
+                                            * so the core may decide to skip producing audio or video.
+                                            * Bit 0 (value 1) is set if Video is enabled,
+                                            * Bit 1 (value 2) is set if Audio is enabled.
+                                            * Other bits are reserved for future use.
+                                            */
 
 #define RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE (41 | RETRO_ENVIRONMENT_EXPERIMENTAL)
                                            /* const struct retro_hw_render_interface ** --

libretro-common/include/retro_common_api.h

@@ -76,11 +76,15 @@ typedef int ssize_t;
 #endif
 
 #ifdef _MSC_VER
+#if _MSC_VER >= 1800
+#include <inttypes.h>
+#else
 #ifndef PRId64
 #define PRId64 "I64d"
 #define PRIu64 "I64u"
 #define PRIuPTR "Iu"
 #endif
+#endif
 #else
 /* C++11 says this one isn't needed, but apparently (some versions of) mingw require it anyways */
 /* https://stackoverflow.com/questions/8132399/how-to-printf-uint64-t-fails-with-spurious-trailing-in-format */

libretro-common/include/retro_miscellaneous.h

@@ -23,6 +23,9 @@
 #ifndef __RARCH_MISCELLANEOUS_H
 #define __RARCH_MISCELLANEOUS_H
 
+#define RARCH_MAX_SUBSYSTEMS 10
+#define RARCH_MAX_SUBSYSTEM_ROMS 10
+
 #include <stdint.h>
 #include <boolean.h>
 #include <retro_inline.h>

libretro-common/include/streams/file_stream.h

@@ -47,7 +47,7 @@ typedef struct RFILE RFILE;
 
 void filestream_vfs_init(const struct retro_vfs_interface_info* vfs_info);
 
-int64_t filestream_get_size(RFILE *stream);
+ssize_t filestream_get_size(RFILE *stream);
 
 /**
  * filestream_open:

libretro-common/include/string/stdstring.h

@@ -31,6 +31,7 @@
 
 #include <retro_common_api.h>
 #include <retro_inline.h>
+#include <compat/strl.h>
 
 RETRO_BEGIN_DECLS
 
@@ -48,12 +49,54 @@ static INLINE bool string_is_equal(const char *a, const char *b)
    return (*(const unsigned char*)a - *(const unsigned char*)b) == 0;
 }
 
+static INLINE bool string_is_not_equal(const char *a, const char *b)
+{
+   return !string_is_equal(a, b);
+}
+
+#define string_add_pair_open(s, size)    strlcat((s), " (", (size))
+#define string_add_pair_close(s, size)   strlcat((s), ")",  (size))
+#define string_add_bracket_open(s, size) strlcat((s), "{",  (size))
+#define string_add_bracket_close(s, size) strlcat((s), "}",  (size))
+#define string_add_single_quote(s, size) strlcat((s), "'",  (size))
+#define string_add_quote(s, size) strlcat((s), "\"",  (size))
+#define string_add_colon(s, size) strlcat((s), ":",  (size))
+#define string_add_glob_open(s, size) strlcat((s), "glob('*",  (size))
+#define string_add_glob_close(s, size) strlcat((s), "*')",  (size))
+
+static INLINE void string_add_between_pairs(char *s, const char *str,
+      size_t size)
+{
+   string_add_pair_open(s, size);
+   strlcat(s, str,  size);
+   string_add_pair_close(s, size);
+}
+
 #define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
 #define string_is_equal_fast(a, b, size) (memcmp(a, b, size) == 0)
 
+static INLINE bool string_is_equal_case_insensitive(const char *a,
+      const char *b)
+{
+   int result              = 0;
+   const unsigned char *p1 = (const unsigned char*)a;
+   const unsigned char *p2 = (const unsigned char*)b;
+
+   if (!a || !b)
+      return false;
+   if (p1 == p2)
+      return true;
+
+   while ((result = tolower (*p1) - tolower (*p2++)) == 0)
+      if (*p1++ == '\0')
+         break;
+
+   return (result == 0);
+}
+
 static INLINE bool string_is_equal_noncase(const char *a, const char *b)
 {
-   int result;
+   int result              = 0;
    const unsigned char *p1 = (const unsigned char*)a;
    const unsigned char *p2 = (const unsigned char*)b;
 

libretro-common/streams/file_stream.c

@@ -31,6 +31,7 @@
 #endif
 
 #include <streams/file_stream.h>
+#define VFS_FRONTEND
 #include <vfs/vfs_implementation.h>
 
 static const int64_t vfs_error_return_value      = -1;
@@ -110,9 +111,9 @@ bool filestream_exists(const char *path)
    return true;
 }
 
-int64_t filestream_get_size(RFILE *stream)
+ssize_t filestream_get_size(RFILE *stream)
 {
-   int64_t output;
+   ssize_t output;
 
    if (filestream_size_cb != NULL)
       output = filestream_size_cb(stream->hfile);
@@ -460,21 +461,27 @@ bool filestream_write_file(const char *path, const void *data, ssize_t size)
 
 char *filestream_getline(RFILE *stream)
 {
-   char* newline     = (char*)malloc(9);
-   char* newline_tmp = NULL;
-   size_t cur_size   = 8;
-   size_t idx        = 0;
-   int in            = filestream_getc(stream);
+   char* newline_tmp  = NULL;
+   size_t cur_size    = 8;
+   size_t idx         = 0;
+   int in             = 0;
+   char* newline      = (char*)malloc(9);
 
-   if (!newline)
+   if (!stream || !newline)
+   {
+      if (newline)
+         free(newline);
       return NULL;
+   }
+
+   in                 = filestream_getc(stream);
 
    while (in != EOF && in != '\n')
    {
       if (idx == cur_size)
       {
-         cur_size *= 2;
-         newline_tmp = (char*)realloc(newline, cur_size + 1);
+         cur_size    *= 2;
+         newline_tmp  = (char*)realloc(newline, cur_size + 1);
 
          if (!newline_tmp)
          {
@@ -482,13 +489,13 @@ char *filestream_getline(RFILE *stream)
             return NULL;
          }
 
-         newline = newline_tmp;
+         newline     = newline_tmp;
       }
 
       newline[idx++] = in;
       in             = filestream_getc(stream);
    }
 
-   newline[idx] = '\0';
+   newline[idx]      = '\0';
    return newline;
 }