diff options
Diffstat (limited to 'src/fs/virtfs')
| -rw-r--r-- | src/fs/virtfs/fs.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/fsdir.cpp | 20 | ||||
| -rw-r--r-- | src/fs/virtfs/rwops.cpp | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/fs/virtfs/fs.cpp b/src/fs/virtfs/fs.cpp index 42b93188e..13d15eb09 100644 --- a/src/fs/virtfs/fs.cpp +++ b/src/fs/virtfs/fs.cpp @@ -64,11 +64,11 @@ namespace VirtFs void updateDirSeparator() { -#ifdef WIN32 +#ifdef _WIN32 dirSeparator = "\\"; -#else // WIN32 +#else // _WIN32 dirSeparator = "/"; -#endif // WIN32 +#endif // _WIN32 } const char *getDirSeparator() diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp index 7832dcce6..c623638ca 100644 --- a/src/fs/virtfs/fsdir.cpp +++ b/src/fs/virtfs/fsdir.cpp @@ -204,7 +204,7 @@ namespace FsDir const std::string file = next_file->d_name; if (file == "." || file == "..") continue; -#ifndef WIN32 +#ifndef _WIN32 if (mPermitLinks == false) { struct stat statbuf; @@ -214,7 +214,7 @@ namespace FsDir continue; } } -#endif // WIN32 +#endif // _WIN32 bool found(false); FOR_EACH (StringVectCIter, itn, names) @@ -256,7 +256,7 @@ namespace FsDir name.c_str()) return false; } -#ifndef WIN32 +#ifndef _WIN32 if (mPermitLinks == false) return false; @@ -265,7 +265,7 @@ namespace FsDir S_ISLNK(statbuf.st_mode) != 0; #else return false; -#endif // WIN32 +#endif // _WIN32 } void freeList(List *restrict const handle) @@ -549,7 +549,7 @@ namespace FsDir const std::string file = next_file->d_name; if (file == "." || file == "..") continue; -#ifndef WIN32 +#ifndef _WIN32 if (mPermitLinks == false) { if (lstat(path.c_str(), &statbuf) == 0 && @@ -558,7 +558,7 @@ namespace FsDir continue; } } -#endif // WIN32 +#endif // _WIN32 const std::string filePath = pathJoin(path, file); if (stat(filePath.c_str(), &statbuf) == 0) @@ -599,7 +599,7 @@ namespace FsDir const std::string file = next_file->d_name; if (file == "." || file == "..") continue; -#ifndef WIN32 +#ifndef _WIN32 if (mPermitLinks == false) { if (lstat(path.c_str(), &statbuf) == 0 && @@ -608,7 +608,7 @@ namespace FsDir continue; } } -#endif // WIN32 +#endif // _WIN32 const std::string filePath = pathJoin(path, file); if (stat(filePath.c_str(), &statbuf) == 0) @@ -649,7 +649,7 @@ namespace FsDir const std::string file = next_file->d_name; if (file == "." || file == "..") continue; -#ifndef WIN32 +#ifndef _WIN32 if (mPermitLinks == false) { if (lstat(path.c_str(), &statbuf) == 0 && @@ -658,7 +658,7 @@ namespace FsDir continue; } } -#endif // WIN32 +#endif // _WIN32 const std::string filePath = pathJoin(path, file); if (stat(filePath.c_str(), &statbuf) == 0) diff --git a/src/fs/virtfs/rwops.cpp b/src/fs/virtfs/rwops.cpp index f4984b547..d710dc1d7 100644 --- a/src/fs/virtfs/rwops.cpp +++ b/src/fs/virtfs/rwops.cpp @@ -52,6 +52,7 @@ #include "utils/checkutils.h" #include "utils/fuzzer.h" +#include "utils/performance.h" PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") |