mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #4336 from wwylele/file-util-mingw

Browse source 
Only redefine some 64-bit file operation for MSVC
This commit is contained in:
Weiyi Wang 2018-10-21 20:34:48 -04:00 committed by GitHub
commit 57ce5079bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -170,7 +170,7 @@ endif()
# On modern Unixes, this is typically already the case. The lone exception is # On modern Unixes, this is typically already the case. The lone exception is
# glibc, which may default to 32 bits. glibc allows this to be configured # glibc, which may default to 32 bits. glibc allows this to be configured
# by setting _FILE_OFFSET_BITS. # by setting _FILE_OFFSET_BITS.
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR MINGW)
add_definitions(-D_FILE_OFFSET_BITS=64) add_definitions(-D_FILE_OFFSET_BITS=64)
endif() endif()

13
src/common/file_util.cpp
View file

@ -14,21 +14,24 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
// windows.h needs to be included before other windows headers // windows.h needs to be included before other windows headers
#include <commdlg.h> // for GetSaveFileName #include <direct.h> // getcwd
#include <direct.h> // getcwd
#include <io.h> #include <io.h>
#include <shellapi.h> #include <shellapi.h>
#include <shlobj.h> // for SHGetFolderPath #include <shlobj.h> // for SHGetFolderPath
#include <tchar.h> #include <tchar.h>
#include "common/string_util.h" #include "common/string_util.h"
// 64 bit offsets for windows #ifdef _MSC_VER
// 64 bit offsets for MSVC
#define fseeko _fseeki64 #define fseeko _fseeki64
#define ftello _ftelli64 #define ftello _ftelli64
#define atoll _atoi64 #define fileno _fileno
#endif
// 64 bit offsets for MSVC and MinGW. MinGW also needs this for using _wstat64
#define stat _stat64 #define stat _stat64
#define fstat _fstat64 #define fstat _fstat64
#define fileno _fileno
#else #else
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/param.h> #include <sys/param.h>