Merge v1.x

This commit is contained in:
gabime
2019-05-24 12:44:51 +03:00
parent 7a3a560c44
commit 884c23a9c9
2 changed files with 23 additions and 23 deletions

View File

@@ -178,7 +178,7 @@ SPDLOG_INLINE bool file_exists(const filename_t &filename) SPDLOG_NOEXCEPT
return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
#else // common linux/unix all have the stat system call
struct stat buffer;
return (stat(filename.c_str(), &buffer) == 0);
return (::stat(filename.c_str(), &buffer) == 0);
#endif
}
@@ -218,7 +218,7 @@ SPDLOG_INLINE size_t filesize(FILE *f)
#else // unix 32 bits or cygwin
struct stat st;
if (fstat(fd, &st) == 0)
if (::fstat(fd, &st) == 0)
{
return static_cast<size_t>(st.st_size);
}