ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move shared file access to compressed utils.

This commit is contained in:
Unknown W. Brackets 2015-04-15 08:30:19 -07:00
parent 8e89418f45
commit 17a58103e2
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/CDVD/CompressedFileReaderUtils.h
View File

@ -15,6 +15,8 @@
#pragma once #pragma once
#include <Pcsx2Types.h>
/////////// Some complementary utilities for zlib_indexed.c ////////// /////////// Some complementary utilities for zlib_indexed.c //////////
// This is ugly, but it's hard to find something which will work/compile for both // 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")) # define PX_fopen_rb(name_wxstr) (fopen(PX_wfilename(name_wxstr), "rb"))
#endif #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 ////////// /////////// End of complementary utilities for zlib_indexed.c //////////

6
pcsx2/CDVD/CsoFileReader.cpp
View File

@ -18,7 +18,11 @@
#include "CompressedFileReaderUtils.h" #include "CompressedFileReaderUtils.h"
#include "CsoFileReader.h" #include "CsoFileReader.h"
#include "Pcsx2Types.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: // Implementation of CSO compressed ISO reading, based on:
// https://github.com/unknownbrackets/maxcso/blob/master/README_CSO.md // https://github.com/unknownbrackets/maxcso/blob/master/README_CSO.md

11
pcsx2/CDVD/zlib_indexed.h
View File

@ -107,16 +107,7 @@ Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
#include <zlib/zlib.h> #include <zlib/zlib.h>
#endif #endif
#include <Pcsx2Types.h> #include "CompressedFileReaderUtils.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
#define local static #define local static