[webkit-changes] [WebKit/WebKit] 170f87: CSSNumericValue.cpp sometimes fails to build

[Sam Weinig]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 170f87e327f4968fd3ee0a83229a1c8fc8ef81cc
      https://github.com/WebKit/WebKit/commit/170f87e327f4968fd3ee0a83229a1c8fc8ef81cc
  Author: Sam Weinig <weinig at apple.com>
  Date:   2022-10-23 (Sun, 23 Oct 2022)

  Changed paths:
    M Source/WebCore/css/typedom/CSSNumericValue.cpp

  Log Message:
  -----------
  CSSNumericValue.cpp sometimes fails to build
https://bugs.webkit.org/show_bug.cgi?id=246926
rdar://101481899

Reviewed by Myles C. Maxfield and Tim Nguyen.

The macro RETURN_IF_EXCEPTION is also defined in JavaScriptCore, so
depending on what happens in transitively included headers and/or
is included due to unified build concatenation, we can fail to
build due to duplicate macro definition errors. This changes the
name of the macro in CSSNumericValue.cpp to a unique name to avoid
the issue.

* Source/WebCore/css/typedom/CSSNumericValue.cpp:
(WebCore::convertToExceptionOrNumericValue):
(WebCore::reifyMathExpression):
(WebCore::reifyMathExpressions):
(WebCore::CSSNumericValue::div):

Canonical link: https://commits.webkit.org/255902@main