[webkit-changes] [WebKit/WebKit] 33b2db: Fix internal build

Alex Christensen noreply at github.com
Tue Jun 20 11:25:49 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 33b2dbbce6c250cf0afa8e718099f2bc2149933c
      https://github.com/WebKit/WebKit/commit/33b2dbbce6c250cf0afa8e718099f2bc2149933c
  Author: Alex Christensen <achristensen at apple.com>
  Date:   2023-06-20 (Tue, 20 Jun 2023)

  Changed paths:
    M Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.cc
    M Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.h
    M Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

  Log Message:
  -----------
  Fix internal build
https://bugs.webkit.org/show_bug.cgi?id=258311
rdar://111052412

Unreviewed.

There is an internal header in an internal SDK that #defines kName to something that is not compatible with
it being used as a variable name in a header.  To avoid the name collision, just rename kName to kNameGoog.

* Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.cc:
* Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.h:
* Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc:

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




More information about the webkit-changes mailing list