diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-23 10:23:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 10:23:41 -0400 |
| commit | e7e209d9001967319fb4cba374ee9c750adf1fb6 (patch) | |
| tree | d3449345bf133db24c3545571331fb2a8eea07fa /src/common | |
| parent | 57164962393ff810f34f3e0601be0314627c891d (diff) | |
| parent | d9ca6351dd82ad644b6cbdbb8184c9b90bbfa9ed (diff) | |
Merge pull request #1552 from FearlessTobi/port-4336
Port citra-emu/citra#4336: "Only redefine some 64-bit file operation for MSVC"
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/file_util.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 548463787..b52492da6 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -15,21 +15,24 @@ #ifdef _WIN32 #include <windows.h> // 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 <shellapi.h> #include <shlobj.h> // for SHGetFolderPath #include <tchar.h> #include "common/string_util.h" -// 64 bit offsets for windows +#ifdef _MSC_VER +// 64 bit offsets for MSVC #define fseeko _fseeki64 #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 fstat _fstat64 -#define fileno _fileno + #else #ifdef __APPLE__ #include <sys/param.h> |