feat(Core/Build): Patched to be buildable on FreeBSD 13.0-RELEASE (#9568)
This commit is contained in:
parent
85abfafb2b
commit
fa46f13b09
3
deps/g3dlite/include/G3D/System.h
vendored
3
deps/g3dlite/include/G3D/System.h
vendored
@ -20,8 +20,7 @@
|
||||
#include "G3D/BinaryFormat.h"
|
||||
#include "G3D/FileNotFound.h"
|
||||
#include <string>
|
||||
|
||||
#if defined(__aarch64__)
|
||||
#if defined(__aarch64__) || defined(__FreeBSD__)
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
|
||||
8
deps/g3dlite/source/FileSystem.cpp
vendored
8
deps/g3dlite/source/FileSystem.cpp
vendored
@ -26,9 +26,9 @@
|
||||
// Needed for _findfirst
|
||||
# include <io.h>
|
||||
# ifdef __MINGW32__
|
||||
# define stat64 stat
|
||||
# define stat stat
|
||||
# else
|
||||
# define stat64 _stat64
|
||||
# define stat _stat
|
||||
# endif
|
||||
#else
|
||||
# include <dirent.h>
|
||||
@ -580,8 +580,8 @@ bool FileSystem::_isNewer(const std::string& _src, const std::string& _dst) {
|
||||
int64 FileSystem::_size(const std::string& _filename) {
|
||||
const std::string& filename = FilePath::canonicalize(FilePath::expandEnvironmentVariables(_filename));
|
||||
|
||||
struct stat64 st;
|
||||
int result = stat64(filename.c_str(), &st);
|
||||
struct stat st;
|
||||
int result = stat(filename.c_str(), &st);
|
||||
|
||||
if (result == -1) {
|
||||
#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
|
||||
|
||||
@ -89,6 +89,12 @@ time_t LocalTimeToUTCTime(time_t time)
|
||||
{
|
||||
#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
|
||||
return time + _timezone;
|
||||
#elif defined(__FreeBSD__)
|
||||
struct tm tm;
|
||||
|
||||
gmtime_r(&time, &tm);
|
||||
tm.tm_isdst = -1;
|
||||
return mktime(&tm);
|
||||
#else
|
||||
return time + timezone;
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user