aboutsummaryrefslogtreecommitdiff
path: root/deps/libchdr/coretypes.h
diff options
context:
space:
mode:
authornegativeExponent2020-06-05 19:56:44 +0800
committernegativeExponent2020-06-05 19:59:07 +0800
commit9c659ffe685d5615b15c31cd86814e597cff7488 (patch)
tree2a4aa579a9c05e22493d02503bc7191ea26aff8a /deps/libchdr/coretypes.h
parent7973b25fe929f92e146a854ecaf4f3cea5b4ffb8 (diff)
downloadpcsx_rearmed-9c659ffe685d5615b15c31cd86814e597cff7488.tar.gz
pcsx_rearmed-9c659ffe685d5615b15c31cd86814e597cff7488.tar.bz2
pcsx_rearmed-9c659ffe685d5615b15c31cd86814e597cff7488.zip
libchdr: Update to latest upstream
Update libchdr based from latest upstream sources. Fixes some issues as noted. - Latest upstream commit: https://github.com/rtissera/libchdr/tree/6117d59d00ef8620de4cff4d6ecae46368cae881 - Fix https://github.com/libretro/pcsx_rearmed/issues/301 - Specific commit that fixes above problem: https://github.com/rtissera/libchdr/commit/e1acac6d83b36531e543e39a9e1a363e681083e6
Diffstat (limited to 'deps/libchdr/coretypes.h')
-rw-r--r--deps/libchdr/coretypes.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/deps/libchdr/coretypes.h b/deps/libchdr/coretypes.h
index 6264bea..5aecc14 100644
--- a/deps/libchdr/coretypes.h
+++ b/deps/libchdr/coretypes.h
@@ -4,10 +4,6 @@
#include <stdint.h>
#include <stdio.h>
-#ifdef __LIBRETRO__
-#include <streams/file_stream_transforms.h>
-#endif
-
#define ARRAY_LENGTH(x) (sizeof(x)/sizeof(x[0]))
typedef uint64_t UINT64;
@@ -26,15 +22,13 @@ typedef int8_t INT8;
#define core_fread(fc, buff, len) fread(buff, 1, len, fc)
#define core_fclose fclose
#define core_ftell ftell
-
-static size_t core_fsize(core_file* f)
+static size_t core_fsize(core_file *f)
{
- size_t rv;
- size_t p = ftell(f);
- fseek(f, 0, SEEK_END);
- rv = ftell(f);
- fseek(f, p, SEEK_SET);
- return rv;
+ long p = ftell(f);
+ fseek(f, 0, SEEK_END);
+ long rv = ftell(f);
+ fseek(f, p, SEEK_SET);
+ return rv;
}
#endif