Pier Angelo Vendrame pushed to branch base-browser-140.0a1-15.0-1 at The Tor
Project / Applications / Tor Browser
Commits:
75272211 by Pier Angelo Vendrame at 2025-06-11T08:56:12+02:00
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.
- - - - -
5 changed files:
- media/libaom/moz.build
- third_party/abseil-cpp/absl/base/base_gn/moz.build
- third_party/abseil-cpp/absl/base/internal/thread_identity.cc
- third_party/abseil-cpp/absl/base/internal/thread_identity.h
- third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
Changes:
=====================================
media/libaom/moz.build
=====================================
@@ -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
=====================================
@@ -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
=====================================
@@ -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
=====================================
@@ -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
=====================================
@@ -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)) {
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/75272211f12ebe92691423349351c688b72e7496
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/75272211f12ebe92691423349351c688b72e7496
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
