Merge from libretro/master:46902e0 for repo synchronization

This commit is contained in:
kub 2020-12-05 10:21:35 +01:00
parent 9d1ecde692
commit 61d76999d7
74 changed files with 14043 additions and 2094 deletions

View file

@ -11,6 +11,10 @@
#include "cdd.h"
#include "cue.h"
#ifdef USE_LIBRETRO_VFS
#include "file_stream_transforms.h"
#endif
#if defined(__GNUC__) && __GNUC__ >= 7
#pragma GCC diagnostic ignored "-Wformat-truncation"
#endif

View file

@ -13,6 +13,10 @@
#include "../pico_int.h"
// #define elprintf(w,f,...) printf(f "\n",##__VA_ARGS__);
#ifdef USE_LIBRETRO_VFS
#include "file_stream_transforms.h"
#endif
#ifdef _MSC_VER
#define snprintf _snprintf
#endif
@ -74,9 +78,11 @@ static int get_ext(const char *fname, char ext[4],
strcpy(ext, fname + pos);
if (base != NULL) {
len = pos;
if (len + 1 < base_size)
len = base_size - 1;
if (pos + 1 < base_size)
pos = base_size - 1;
len = (pos < len) ? pos : len;
memcpy(base, fname, len);
base[len] = 0;
}