Verified Commit 81d916f0 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! BB 42758: Fix WebRTC build errors. 

MB 440: Change abseil's thread mode.

Remove pthread again and use win32 threads also when building with
mingw.
parent e1670e7a

media/libaom/moz.build

+0 −3
Original line number Diff line number Diff line
@@ -143,6 +143,3 @@ LOCAL_INCLUDES += [ 
#         TEST_DIRS += [

#             'test/fuzztest'

#     ]
 


if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["CC_TYPE"] == "clang":

    OS_LIBS += ["pthread"]

third_party/abseil-cpp/absl/base/base_gn/moz.build

+0 −3
Original line number Diff line number Diff line
@@ -168,7 +168,4 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": 


    DEFINES["_GNU_SOURCE"] = True



if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["CC_TYPE"] == "clang":

    OS_LIBS += ["pthread"]



Library("base_gn")

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

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ HRESULT WgcCaptureSession::ProcessFrame() { 
    return hr;

  }



  ComPtr<ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess>

  ComPtr<Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess>

      direct3DDxgiInterfaceAccess;

  hr = d3d_surface->QueryInterface(IID_PPV_ARGS(&direct3DDxgiInterfaceAccess));

  if (FAILED(hr)) {