From 4914c164fa78e075cb32b115c4fe674ea16134d2 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 19 Apr 2018 07:56:57 +0200
Subject: [PATCH] Update file_stream_transforms

---
 .../include/streams/file_stream_transforms.h      | 15 ++++++++-------
 libretro-common/streams/file_stream_transforms.c  | 10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libretro-common/include/streams/file_stream_transforms.h b/libretro-common/include/streams/file_stream_transforms.h
index 7919f6fbbd..77f52eb683 100644
--- a/libretro-common/include/streams/file_stream_transforms.h
+++ b/libretro-common/include/streams/file_stream_transforms.h
@@ -23,9 +23,10 @@
 #ifndef __LIBRETRO_SDK_FILE_STREAM_TRANSFORMS_H
 #define __LIBRETRO_SDK_FILE_STREAM_TRANSFORMS_H
 
+#include <stdint.h>
+#include <string.h>
 #include <retro_common_api.h>
 #include <streams/file_stream.h>
-#include <string.h>
 
 RETRO_BEGIN_DECLS
 
@@ -61,19 +62,19 @@ RFILE* rfopen(const char *path, const char *mode);
 
 int rfclose(RFILE* stream);
 
-long rftell(RFILE* stream);
+int64_t rftell(RFILE* stream);
 
-int rfseek(RFILE* stream, long offset, int origin);
+int64_t rfseek(RFILE* stream, int64_t offset, int origin);
 
-size_t rfread(void* buffer,
-   size_t elementSize, size_t elementCount, RFILE* stream);
+int64_t rfread(void* buffer,
+   size_t elem_size, size_t elem_count, RFILE* stream);
 
 char *rfgets(char *buffer, int maxCount, RFILE* stream);
 
 int rfgetc(RFILE* stream);
 
-size_t rfwrite(void const* buffer,
-   size_t elementSize, size_t elementCount, RFILE* stream);
+int64_t rfwrite(void const* buffer,
+   size_t elem_size, size_t elem_count, RFILE* stream)
 
 int rfputc(int character, RFILE * stream);
 
diff --git a/libretro-common/streams/file_stream_transforms.c b/libretro-common/streams/file_stream_transforms.c
index c35a337388..efeb7edd9c 100644
--- a/libretro-common/streams/file_stream_transforms.c
+++ b/libretro-common/streams/file_stream_transforms.c
@@ -72,12 +72,12 @@ int rfclose(RFILE* stream)
    return filestream_close(stream);
 }
 
-long rftell(RFILE* stream)
+int64_t rftell(RFILE* stream)
 {
    return filestream_tell(stream);
 }
 
-int rfseek(RFILE* stream, long offset, int origin)
+int64_t rfseek(RFILE* stream, int64_t offset, int origin)
 {
    int seek_position = -1;
    switch (origin)
@@ -93,10 +93,10 @@ int rfseek(RFILE* stream, long offset, int origin)
          break;
    }
 
-   return (int)filestream_seek(stream, (ssize_t)offset, seek_position);
+   return filestream_seek(stream, offset, seek_position);
 }
 
-size_t rfread(void* buffer,
+int64_t rfread(void* buffer,
    size_t elem_size, size_t elem_count, RFILE* stream)
 {
    return filestream_read(stream, buffer, elem_size * elem_count);
@@ -112,7 +112,7 @@ int rfgetc(RFILE* stream)
 	return filestream_getc(stream);
 }
 
-size_t rfwrite(void const* buffer,
+int64_t rfwrite(void const* buffer,
    size_t elem_size, size_t elem_count, RFILE* stream)
 {
    return filestream_write(stream, buffer, elem_size * elem_count);