diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 04:06:01 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 20:45:20 +0200 |
| commit | f3c096951be57a02467bfda74ab539e69b2eff5e (patch) | |
| tree | 831ce67740685915e075ef991b324d807987a055 | |
| parent | Common: Remove many unnecessary cross-platform compatibility macros (diff) | |
| download | yuzu-f3c096951be57a02467bfda74ab539e69b2eff5e.tar yuzu-f3c096951be57a02467bfda74ab539e69b2eff5e.tar.gz yuzu-f3c096951be57a02467bfda74ab539e69b2eff5e.tar.bz2 yuzu-f3c096951be57a02467bfda74ab539e69b2eff5e.tar.lz yuzu-f3c096951be57a02467bfda74ab539e69b2eff5e.tar.xz yuzu-f3c096951be57a02467bfda74ab539e69b2eff5e.tar.zst yuzu-f3c096951be57a02467bfda74ab539e69b2eff5e.zip | |
| -rw-r--r-- | src/common/common_funcs.h | 8 | ||||
| -rw-r--r-- | src/common/file_util.cpp | 44 |
2 files changed, 26 insertions, 26 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 9e666d77e..56ae791d4 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -117,14 +117,6 @@ inline u64 _rotr64(u64 x, unsigned int shift){ return old_locale; } -// 64 bit offsets for windows - #define fseeko _fseeki64 - #define ftello _ftelli64 - #define atoll _atoi64 - #define stat64 _stat64 - #define fstat64 _fstat64 - #define fileno _fileno - extern "C" { __declspec(dllimport) void __stdcall DebugBreak(void); } diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 25d7d4b9f..946c4261a 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -7,37 +7,45 @@ #include "common/file_util.h" #ifdef _WIN32 -#include <windows.h> -#include <shlobj.h> // for SHGetFolderPath -#include <shellapi.h> -#include <commdlg.h> // for GetSaveFileName -#include <io.h> -#include <direct.h> // getcwd -#include <tchar.h> + #include <windows.h> + #include <shlobj.h> // for SHGetFolderPath + #include <shellapi.h> + #include <commdlg.h> // for GetSaveFileName + #include <io.h> + #include <direct.h> // getcwd + #include <tchar.h> + + // 64 bit offsets for windows + #define fseeko _fseeki64 + #define ftello _ftelli64 + #define atoll _atoi64 + #define stat64 _stat64 + #define fstat64 _fstat64 + #define fileno _fileno #else -#include <sys/param.h> -#include <sys/types.h> -#include <dirent.h> -#include <pwd.h> -#include <unistd.h> + #include <sys/param.h> + #include <sys/types.h> + #include <dirent.h> + #include <pwd.h> + #include <unistd.h> #endif #if defined(__APPLE__) -#include <CoreFoundation/CFString.h> -#include <CoreFoundation/CFURL.h> -#include <CoreFoundation/CFBundle.h> + #include <CoreFoundation/CFString.h> + #include <CoreFoundation/CFURL.h> + #include <CoreFoundation/CFBundle.h> #endif #include <algorithm> #include <sys/stat.h> #ifndef S_ISDIR -#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) + #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) #endif #ifdef BSD4_4 -#define stat64 stat -#define fstat64 fstat + #define stat64 stat + #define fstat64 fstat #endif // This namespace has various generic functions related to files and paths. |