mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Support NetBSD and simplify platform ifdefs. (#10271)

Browse Source 
For files intended to support unixy freedesktopy systems,
reduce the ifdef down to __unix__ && !__APPLE__ && !__ANDROID__,
rather than naming linux and all the BSDs and so on by hand.

Should simplify adding support for systems like illumos in the
future.

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
This commit is contained in:
nia
2019-12-22 16:07:40 +00:00
committed by Michael Steenbeek
parent 96ff8fe7a1
commit addd27d4dc
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/platform/Platform.Linux.cpp
View File

@@ -7,16 +7,16 @@
* OpenRCT2 is licensed under the GNU General Public License version 3.
*****************************************************************************/
#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__linux__) && !defined(__ANDROID__))
#if defined(__unix__) && !defined(__ANDROID__) && !defined(__APPLE__)
# include <limits.h>
# include <pwd.h>
# include <vector>
# if defined(__FreeBSD__)
# if defined(__FreeBSD__) || defined(__NetBSD__)
# include <stddef.h>
# include <sys/param.h>
# include <sys/sysctl.h>
# endif // __FreeBSD__
# endif // __FreeBSD__ || __NetBSD__
# if defined(__linux__)
// for PATH_MAX
# include <linux/limits.h>
@@ -129,8 +129,12 @@ namespace Platform
{
log_fatal("failed to read /proc/self/exe");
}
# elif defined(__FreeBSD__)
# elif defined(__FreeBSD__) || defined(__NetBSD__)
# if defined(__FreeBSD__)
const int32_t mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
# else
const int32_t mib[] = { CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME };
# endif
auto exeLen = sizeof(exePath);
if (sysctl(mib, 4, exePath, &exeLen, nullptr, 0) == -1)
{