Current platform feature detection does not work for GNU/Hurd. One place misuse __MACH__ for detection of Apple platform. Correct them all for GNU/Hurd. --- absl/base/config.h | 2 +- absl/base/internal/raw_logging.cc | 2 +- absl/log/stripping_test.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/absl/base/config.h b/absl/base/config.h index 0b22167e..8bb27b6e 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -380,7 +380,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || defined(__asmjs__) || defined(__EMSCRIPTEN__) || defined(__Fuchsia__) || \ defined(__sun) || defined(__myriad2__) || defined(__HAIKU__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__QNX__) || \ - defined(__VXWORKS__) || defined(__hexagon__) + defined(__VXWORKS__) || defined(__hexagon__) || defined(__GNU__) #define ABSL_HAVE_MMAP 1 #endif diff --git a/absl/base/internal/raw_logging.cc b/absl/base/internal/raw_logging.cc index d32b40a8..81630372 100644 --- a/absl/base/internal/raw_logging.cc +++ b/absl/base/internal/raw_logging.cc @@ -44,7 +44,7 @@ #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ defined(__hexagon__) || defined(__Fuchsia__) || \ defined(__native_client__) || defined(__OpenBSD__) || \ - defined(__EMSCRIPTEN__) || defined(__ASYLO__) + defined(__EMSCRIPTEN__) || defined(__ASYLO__) || defined(__GNU__) #include <unistd.h> diff --git a/absl/log/stripping_test.cc b/absl/log/stripping_test.cc index 271fae1d..20231b9f 100644 --- a/absl/log/stripping_test.cc +++ b/absl/log/stripping_test.cc @@ -33,7 +33,7 @@ #include <stdio.h> -#if defined(__MACH__) +#if defined(__APPLE__) #include <mach-o/dyld.h> #elif defined(_WIN32) #include <Windows.h> @@ -191,7 +191,7 @@ class StrippingTest : public ::testing::Test { absl::FPrintF(stderr, "Failed to open /pkg/bin/<binary name>: %s\n", err); } return fp; -#elif defined(__MACH__) +#elif defined(__APPLE__) uint32_t size = 0; int ret = _NSGetExecutablePath(nullptr, &size); if (ret != -1) { -- Yuqian Yang <crup...@crupest.life>