diff options
| author | Lloyd Dilley <ldilley@users.noreply.github.com> | 2022-10-01 11:17:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-01 17:17:46 +0200 |
| commit | 2b8fc95fdec69ca5c057c2e63a1313d8165d44ea (patch) | |
| tree | 5887ba32f683fd789a7627b95bfe4b497e79076c | |
| parent | a51fef236ebf0f1c459683f1f9c16242969af7d4 (diff) | |
Core/Misc: Fix *BSD compile errors (#28287)
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix16.diff | 14 | ||||
| -rw-r--r-- | dep/g3dlite/source/FileSystem.cpp | 3 | ||||
| -rw-r--r-- | src/common/Utilities/Util.cpp | 2 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix16.diff b/dep/g3dlite/G3D-v9.0 hotfix16.diff new file mode 100644 index 00000000000..5e33c19617b --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix16.diff @@ -0,0 +1,14 @@ +diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp +index 06e6ff00a5e3..0898af795348 100644 +--- a/dep/g3dlite/source/FileSystem.cpp ++++ b/dep/g3dlite/source/FileSystem.cpp +@@ -35,6 +35,9 @@ + # include <fnmatch.h> + # include <unistd.h> + # define _getcwd getcwd ++# if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++# define stat64 stat ++# endif + # define _stat stat + # define stricmp strcasecmp + # define strnicmp strncasecmp diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp index 06e6ff00a5e..0898af79534 100644 --- a/dep/g3dlite/source/FileSystem.cpp +++ b/dep/g3dlite/source/FileSystem.cpp @@ -35,6 +35,9 @@ # include <fnmatch.h> # include <unistd.h> # define _getcwd getcwd +# if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# define stat64 stat +# endif # define _stat stat # define stricmp strcasecmp # define strnicmp strncasecmp diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 3fc026aaa74..45ab3098e91 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -74,6 +74,8 @@ time_t LocalTimeToUTCTime(time_t time) { #if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) return time + _timezone; +#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + return timegm(gmtime(&time)); #else return time + timezone; #endif diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 23223a9a212..933a81425f8 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -434,7 +434,7 @@ int main(int argc, char ** argv) //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx // Create the working directory if (mkdir(szWorkDirWmo -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) , 0711 #endif )) |