Joystick: Remap joystick-specific KeyTypes to generic ones

[dragonfireclient.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index ef1640467d64f28feb83275d4e4694b1027a9a34..e7ed4e0901b8e928cdd2cd564dca46236151f3b0 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -25,9 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "porting.h"
 
-#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__DragonFly__)
+#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
        #include <sys/types.h>
        #include <sys/sysctl.h>
+       extern char **environ;
 #elif defined(_WIN32)
        #include <windows.h>
        #include <wincrypt.h>
@@ -49,6 +50,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if defined(__ANDROID__)
        #include "porting_android.h"
 #endif
+#if defined(__APPLE__)
+       // For _NSGetEnviron()
+       // Related: https://gitlab.haskell.org/ghc/ghc/issues/2458
+       #include <crt_externs.h>
+#endif
+
+#if defined(__HAIKU__)
+        #include <FindDirectory.h>
+#endif
 
 #include "config.h"
 #include "debug.h"
@@ -315,6 +325,12 @@ bool getCurrentExecPath(char *buf, size_t len)
        return true;
 }
 
+#elif defined(__HAIKU__)
+
+bool getCurrentExecPath(char *buf, size_t len)
+{
+       return find_path(B_APP_IMAGE_SYMBOL, B_FIND_PATH_IMAGE_PATH, NULL, buf, len) == B_OK;
+}
 
 //// Solaris
 #elif defined(__sun) || defined(sun)
@@ -718,7 +734,8 @@ bool openURL(const std::string &url)
        return true;
 #elif defined(__APPLE__)
        const char *argv[] = {"open", url.c_str(), NULL};
-       return posix_spawnp(NULL, "open", NULL, NULL, (char**)argv, environ) == 0;
+       return posix_spawnp(NULL, "open", NULL, NULL, (char**)argv,
+               (*_NSGetEnviron())) == 0;
 #else
        const char *argv[] = {"xdg-open", url.c_str(), NULL};
        return posix_spawnp(NULL, "xdg-open", NULL, NULL, (char**)argv, environ) == 0;