From 01871a4cbcc6d645ecb5b478eddbf38de47d790b Mon Sep 17 00:00:00 2001 From: Rick V Date: Mon, 25 Feb 2019 21:05:21 -0600 Subject: [PATCH] fix openbsd --- vendor/abseil-cpp/absl/base/config.h | 7 ++++--- vendor/abseil-cpp/absl/debugging/failure_signal_handler.cc | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vendor/abseil-cpp/absl/base/config.h b/vendor/abseil-cpp/absl/base/config.h index 39d0b8fc6..42a54630c 100644 --- a/vendor/abseil-cpp/absl/base/config.h +++ b/vendor/abseil-cpp/absl/base/config.h @@ -262,6 +262,7 @@ // AsmJS __asmjs__ // WebAssembly __wasm__ // Fuchsia __Fuchsia__ +// OpenBSD __OpenBSD__ // // Note that since Android defines both __ANDROID__ and __linux__, one // may probe for either Linux or Android by simply testing for __linux__. @@ -275,7 +276,7 @@ #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \ defined(__wasm__) || defined(__Fuchsia__) || defined(__sun) || \ - defined(__ASYLO__) + defined(__ASYLO__) || defined(__OpenBSD__) #define ABSL_HAVE_MMAP 1 #endif @@ -286,7 +287,7 @@ #ifdef ABSL_HAVE_PTHREAD_GETSCHEDPARAM #error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ - defined(__ros__) + defined(__ros__) || defined(__OpenBSD__) #define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1 #endif @@ -311,7 +312,7 @@ // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set -#elif defined(__linux__) || defined(__ros__) +#elif defined(__linux__) || defined(__ros__) || defined(__OpenBSD__) #define ABSL_HAVE_SEMAPHORE_H 1 #endif diff --git a/vendor/abseil-cpp/absl/debugging/failure_signal_handler.cc b/vendor/abseil-cpp/absl/debugging/failure_signal_handler.cc index a3a36f645..3efe04a3b 100644 --- a/vendor/abseil-cpp/absl/debugging/failure_signal_handler.cc +++ b/vendor/abseil-cpp/absl/debugging/failure_signal_handler.cc @@ -125,7 +125,7 @@ static bool SetupAlternateStackOnce() { #else const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; #endif - size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; + size_t stack_size = (std::max(SIGSTKSZ, (unsigned)65536) + page_mask) & ~page_mask; #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \ defined(THREAD_SANITIZER) // Account for sanitizer instrumentation requiring additional stack space.