From: Tomas Popela <tpopela@redhat.com>
Date: Fri, 14 Sep 2018 18:23:00 +0000 (+0100)
Subject: Use ternary operator instead of std::max()
X-Git-Tag: archive/raspbian/2.22.0-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b6d6c711fbd088e7ef9aa12c986018c2633b733f;p=webkit2gtk.git

Use ternary operator instead of std::max()

===================================================================

Gbp-Pq: Name replace-stdmax.patch
---

diff --git a/Source/JavaScriptCore/heap/RegisterState.h b/Source/JavaScriptCore/heap/RegisterState.h
index baaef4c785..b3037dba18 100644
--- a/Source/JavaScriptCore/heap/RegisterState.h
+++ b/Source/JavaScriptCore/heap/RegisterState.h
@@ -166,7 +166,7 @@ using RegisterState = jmp_buf;
 #pragma warning(disable: 4611)
 #endif
 #define ALLOCATE_AND_GET_REGISTER_STATE(registers) \
-    alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \
+    alignas(alignof(void*) > alignof(RegisterState) ? alignof(void*) : alignof(RegisterState)) RegisterState registers; \
     setjmp(registers)
 
 #if COMPILER(MSVC)