X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flibchdr%2Finclude%2Flibchdr%2Fcoretypes.h;h=99ef322f72fc6f8e11be8f94edd4ef7506957d4f;hb=479d58cf907d87d12c2ab6cf9acc17f88ef2eeec;hp=fc3f1d1f0f00f5f82fd6bae5c3218b620c9c67ca;hpb=a9821f0781616b67cfaf19640db44f8aa20e4ab7;p=pcsx_rearmed.git

diff --git a/deps/libchdr/include/libchdr/coretypes.h b/deps/libchdr/include/libchdr/coretypes.h
index fc3f1d1f..99ef322f 100644
--- a/deps/libchdr/include/libchdr/coretypes.h
+++ b/deps/libchdr/include/libchdr/coretypes.h
@@ -20,13 +20,16 @@ typedef int32_t INT32;
 typedef int16_t INT16;
 typedef int8_t INT8;
 
-#define core_file FILE
-#ifdef HAVE_LIBRETRO
-#include <compat/fopen_utf8.h>
-#define core_fopen(file) fopen_utf8(file, "rb")
+#ifdef USE_LIBRETRO_VFS
+#define core_file RFILE
+#define core_fopen(file) rfopen(file, "rb")
+#define core_fseek rfseek
+#define core_ftell rftell
+#define core_fread(fc, buff, len) rfread(buff, 1, len, fc)
+#define core_fclose rfclose
 #else
+#define core_file FILE
 #define core_fopen(file) fopen(file, "rb")
-#endif
 #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WIN64__)
 	#define core_fseek _fseeki64
 	#define core_ftell _ftelli64
@@ -39,7 +42,11 @@ typedef int8_t INT8;
 #endif
 #define core_fread(fc, buff, len) fread(buff, 1, len, fc)
 #define core_fclose fclose
+#endif
 
+#ifdef __GNUC__
+__attribute__ ((unused))
+#endif
 static UINT64 core_fsize(core_file *f)
 {
     UINT64 rv;