From 04ed2d78d2225fc0a0d7dbdb08fff3156b4d1235 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Tue, 27 Jun 2017 07:56:03 +0100 Subject: [PATCH] Fix building on FreeBSD --- src/openrct2-ui/UiContext.Linux.cpp | 2 +- src/openrct2/core/FileStream.hpp | 4 ++-- src/openrct2/platform/linux.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/UiContext.Linux.cpp b/src/openrct2-ui/UiContext.Linux.cpp index 0ef85c8d8c..7a61b49af8 100644 --- a/src/openrct2-ui/UiContext.Linux.cpp +++ b/src/openrct2-ui/UiContext.Linux.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#if (defined(__linux__) || defined(__OpenBSD__)) && !defined(__ANDROID__) +#if (defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__)) && !defined(__ANDROID__) #include #include diff --git a/src/openrct2/core/FileStream.hpp b/src/openrct2/core/FileStream.hpp index a3081e0376..04142ffb65 100644 --- a/src/openrct2/core/FileStream.hpp +++ b/src/openrct2/core/FileStream.hpp @@ -116,7 +116,7 @@ public: { #if defined(_MSC_VER) return _ftelli64(_file); -#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__ANDROID__) || defined(__OpenBSD__) +#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__ANDROID__) || defined(__OpenBSD__) || defined(__FreeBSD__) return ftello(_file); #else return ftello64(_file); @@ -142,7 +142,7 @@ public: _fseeki64(_file, offset, SEEK_END); break; } -#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__ANDROID__) || defined(__OpenBSD__) +#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__ANDROID__) || defined(__OpenBSD__) || defined(__FreeBSD__) switch (origin) { case STREAM_SEEK_BEGIN: fseeko(_file, offset, SEEK_SET); diff --git a/src/openrct2/platform/linux.c b/src/openrct2/platform/linux.c index aebbb84177..aea80e63ed 100644 --- a/src/openrct2/platform/linux.c +++ b/src/openrct2/platform/linux.c @@ -18,9 +18,9 @@ // Despite the name, this file contains support for more OSs besides Linux, provided the necessary ifdefs remain small. // Otherwise, they should be spun off into their own files. -#if (defined(__linux__) || defined(__FREEBSD__) || defined(__OpenBSD__)) && !defined(__ANDROID__) +#if (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ANDROID__) -#ifdef __FREEBSD__ +#ifdef __FreeBSD__ #include #endif @@ -49,7 +49,7 @@ void platform_get_exe_path(utf8 *outPath, size_t outSize) log_fatal("failed to read /proc/self/exe"); } exePath[bytesRead - 1] = '\0'; -#elif defined(__FREEBSD__) +#elif defined(__FreeBSD__) size_t exeLen = sizeof(exePath); const sint32 mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; if (sysctl(mib, 4, exePath, &exeLen, NULL, 0) == -1) {