Verified Commit 570e2348 authored by jwilde's avatar jwilde Committed by Pier Angelo Vendrame
Browse files

BB 42758: Fix WebRTC build errors.

parent ccac76f1

third_party/abseil-cpp/absl/base/internal/thread_identity.cc

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include "absl/base/internal/thread_identity.h"



#if !defined(_WIN32) || defined(__MINGW32__)

#if !defined(_WIN32)

#include <pthread.h>

#ifndef __wasi__

// WASI does not provide this header, either way we disable use

third_party/abseil-cpp/absl/base/internal/thread_identity.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void ClearCurrentThreadIdentity(); 
#error ABSL_THREAD_IDENTITY_MODE cannot be directly set

#elif defined(ABSL_FORCE_THREAD_IDENTITY_MODE)

#define ABSL_THREAD_IDENTITY_MODE ABSL_FORCE_THREAD_IDENTITY_MODE

#elif defined(_WIN32) && !defined(__MINGW32__)

#elif defined(_WIN32)

#define ABSL_THREAD_IDENTITY_MODE ABSL_THREAD_IDENTITY_MODE_USE_CPP11

#elif defined(__APPLE__) && defined(ABSL_HAVE_THREAD_LOCAL)

#define ABSL_THREAD_IDENTITY_MODE ABSL_THREAD_IDENTITY_MODE_USE_CPP11

third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc

+3 −5
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 


#include "modules/desktop_capture/win/wgc_capture_session.h"



#include <DispatcherQueue.h>

#include <dispatcherqueue.h>

#include <windows.graphics.capture.interop.h>

#include <windows.graphics.directX.direct3d11.interop.h>

#include <windows.graphics.directx.direct3d11.interop.h>

#include <windows.graphics.h>

#include <wrl/client.h>

#include <wrl/event.h>
@@ -186,9 +186,7 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) { 


  if (!options.prefer_cursor_embedded()) {

    ComPtr<ABI::Windows::Graphics::Capture::IGraphicsCaptureSession2> session2;

    if (SUCCEEDED(session_->QueryInterface(

            ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2,

            &session2))) {

    if (SUCCEEDED(session_->QueryInterface(IID_PPV_ARGS(&session2)))) {

      session2->put_IsCursorCaptureEnabled(false);

    }

  }

third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#include "modules/desktop_capture/win/wgc_capturer_win.h"



#include <DispatcherQueue.h>

#include <dispatcherqueue.h>

#include <windows.foundation.metadata.h>

#include <windows.graphics.capture.h>

third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_

#define MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_



#include <DispatcherQueue.h>

#include <dispatcherqueue.h>

#include <d3d11.h>

#include <wrl/client.h>