Support __linux__ define to detect linux (#271)

BastianBlokland · web-flow · commit 5a80c57fa372 · 2025-02-14T22:39:58.000+02:00
diff --git a/src/input/search_paths.cpp b/src/input/search_paths.cpp
@@ -3,9 +3,10 @@
 #include <optional>
 #include <string>
 
-#if defined(linux)
+#if defined(linux) || defined(__linux__)
 #include <climits>
 #include <unistd.h>
+#include <linux/limits.h>
 #endif
 
 #if defined(__APPLE__)
@@ -69,7 +70,7 @@ auto getSearchPaths(const char** argv) noexcept -> std::vector<filesystem::path>
 }
 
 auto getExecutablePath() noexcept -> filesystem::path {
-#if defined(linux)
+#if defined(linux) || defined(__linux__)
 
   constexpr auto selfLink = "/proc/self/exe";
 
diff --git a/src/vm/internal/iowatcher.cpp b/src/vm/internal/iowatcher.cpp
@@ -1,4 +1,4 @@
-#if defined(linux)
+#if defined(linux) || defined(__linux__)
 #include "internal/iowatcher_linux.cpp" // NOLINT
 #elif defined(_WIN32)
 #include "internal/iowatcher_win32.cpp" // NOLINT
diff --git a/src/vm/internal/pcall.hpp b/src/vm/internal/pcall.hpp
@@ -362,7 +362,7 @@ auto inline pcall(
   } break;
 
   case PCallCode::PlatformCode: {
-#if defined(linux)
+#if defined(linux) || defined(__linux__)
     PUSH_INT(1);
 #elif defined(__APPLE__) // !linux
     PUSH_INT(2);
diff --git a/src/vm/internal/platform_utilities.cpp b/src/vm/internal/platform_utilities.cpp
@@ -163,7 +163,7 @@ auto platformExecPath(RefAllocator* refAlloc) noexcept -> StringRef* {
     return nullptr;
   }
 
-#if defined(linux)
+#if defined(linux) || defined(__linux__)
 
   constexpr auto selfLink = "/proc/self/exe";
   if (realpath(selfLink, str->getCharDataPtr()) == nullptr) {
diff --git a/tests/vm/misc_pcall_test.cpp b/tests/vm/misc_pcall_test.cpp
@@ -57,7 +57,7 @@ TEST_CASE("[vm] Execute miscellaneous pcalls", "vm") {
   }
 
   SECTION("PlatformCode") {
-#if defined(linux)
+#if defined(linux) || defined(__linux__)
     const auto expectedResult = "1";
 #elif defined(__APPLE__) // !linux
     const auto expectedResult = "2";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if defined(linux)`
	`1`	`+#if defined(linux) \|\| defined(__linux__)`
`2`	`2`	`#include "internal/iowatcher_linux.cpp" // NOLINT`
`3`	`3`	`#elif defined(_WIN32)`
`4`	`4`	`#include "internal/iowatcher_win32.cpp" // NOLINT`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ auto platformExecPath(RefAllocator* refAlloc) noexcept -> StringRef* {`
`163`	`163`	`return nullptr;`
`164`	`164`	`}`
`165`	`165`
`166`		`-#if defined(linux)`
	`166`	`+#if defined(linux) \|\| defined(__linux__)`
`167`	`167`
`168`	`168`	`constexpr auto selfLink = "/proc/self/exe";`
`169`	`169`	`if (realpath(selfLink, str->getCharDataPtr()) == nullptr) {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ TEST_CASE("[vm] Execute miscellaneous pcalls", "vm") {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`SECTION("PlatformCode") {`
`60`		`-#if defined(linux)`
	`60`	`+#if defined(linux) \|\| defined(__linux__)`
`61`	`61`	`const auto expectedResult = "1";`
`62`	`62`	`#elif defined(__APPLE__) // !linux`
`63`	`63`	`const auto expectedResult = "2";`