]>
Commit | Line | Data |
---|---|---|
7b92ae8b JP |
1 | --- chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.orig 2021-08-13 12:36:58.000000000 +0200 |
2 | +++ chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-08-18 22:04:02.165382504 +0200 | |
3 | @@ -135,7 +135,7 @@ | |
4 | #else | |
5 | const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; | |
6 | #endif | |
7 | - size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; | |
8 | + size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; | |
9 | #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ | |
10 | defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) | |
11 | // Account for sanitizer instrumentation requiring additional stack space. | |
12 | --- chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.orig 2021-08-18 22:05:45.366849996 +0200 | |
13 | +++ chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-08-18 22:05:57.647024518 +0200 | |
14 | @@ -138,7 +138,7 @@ | |
15 | // SIGSTKSZ may be too small to prevent the signal handlers from overrunning | |
16 | // the alternative stack. Ensure that the size of the alternative stack is | |
17 | // large enough. | |
18 | - static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); | |
19 | + static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ); | |
20 | ||
21 | // Only set an alternative stack if there isn't already one, or if the current | |
22 | // one is too small. |