Move shared file access to compressed utils.

pcsx2/CDVD/CompressedFileReaderUtils.h

@@ -15,6 +15,8 @@
 
 #pragma once
 
+#include <Pcsx2Types.h>
+
 /////////// Some complementary utilities for zlib_indexed.c //////////
 
 // This is ugly, but it's hard to find something which will work/compile for both
@@ -29,4 +31,14 @@
 #   define PX_fopen_rb(name_wxstr) (fopen(PX_wfilename(name_wxstr), "rb"))
 #endif
 
+#ifdef WIN32
+#	define PX_fseeko _fseeki64
+#   define PX_ftello _ftelli64
+#	define PX_off_t  s64        /* __int64 */
+#else
+#	define PX_fseeko fseeko
+#   define PX_ftello ftello
+#	define PX_off_t  off_t
+#endif
+
 /////////// End of complementary utilities for zlib_indexed.c //////////

pcsx2/CDVD/CsoFileReader.cpp

@@ -18,7 +18,11 @@
 #include "CompressedFileReaderUtils.h"
 #include "CsoFileReader.h"
 #include "Pcsx2Types.h"
-#include "zlib_indexed.h"
+#ifdef __linux__
+#include <zlib.h>
+#else
+#include <zlib/zlib.h>
+#endif
 
 // Implementation of CSO compressed ISO reading, based on:
 // https://github.com/unknownbrackets/maxcso/blob/master/README_CSO.md

pcsx2/CDVD/zlib_indexed.h

@@ -107,16 +107,7 @@ Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
 #include <zlib/zlib.h>
 #endif
 
-#include <Pcsx2Types.h>
-#ifdef WIN32
-#	define PX_fseeko _fseeki64
-#   define PX_ftello _ftelli64
-#	define PX_off_t  s64        /* __int64 */
-#else
-#	define PX_fseeko fseeko
-#   define PX_ftello ftello
-#	define PX_off_t  off_t
-#endif
+#include "CompressedFileReaderUtils.h"
 
 #define local static