fixup! BB 41459: WebRTC fails to build under mingw (Part 2) (5401bb7f) · Commits · The Tor Project / Applications / Mullvad Browser

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

+2 −0

Changes for third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@
		#include <dispatcherqueue.h>
		#include <windows.graphics.capture.interop.h>
		#include <windows.graphics.directx.direct3d11.interop.h>
		#include <windows.graphics.h>
		#include <wrl/client.h>
		#include <wrl/event.h>

		#include <algorithm>

+1 −1

Changes for third_party/libwebrtc/modules/desktop_capture/win/window_capture_utils.h: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		#ifndef MODULES_DESKTOP_CAPTURE_WIN_WINDOW_CAPTURE_UTILS_H_
		#define MODULES_DESKTOP_CAPTURE_WIN_WINDOW_CAPTURE_UTILS_H_

		#include <shlobj_core.h>
		#include <shlobj.h>
		#include <windows.h>
		#include <wrl/client.h>

+1 −1

Changes for third_party/libwebrtc/rtc_base/cpu_info.cc: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ uint64_t xgetbv(uint32_t xcr) {
		}
		#endif // WEBRTC_ENABLE_AVX2

		#ifndef _MSC_VER
		#if !defined(_MSC_VER) && !defined(__MINGW32__)
		// Intrinsic for "cpuid".
		#if defined(__pic__) && defined(__i386__)
		static inline void __cpuid(int cpu_info[4], int info_type) {

+3 −3

Changes for third_party/libwebrtc/rtc_base/win/create_direct3d_device.h: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,9 +12,8 @@
		#define RTC_BASE_WIN_CREATE_DIRECT3D_DEVICE_H_

		#include <windows.graphics.directx.direct3d11.h>
		#ifndef __MINGW32__
		# include <windows.graphics.directX.direct3d11.interop.h>
		#else
		#include <windows.graphics.directx.direct3d11.interop.h>
		#ifdef __MINGW32__
		# include <dxgi.h>
		# include <inspectable.h>
		extern "C" {
		@@ -23,6 +22,7 @@ HRESULT __stdcall CreateDirect3D11DeviceFromDXGIDevice(
		::IDXGIDevice* dxgiDevice, ::IInspectable** graphicsDevice);
		}
		#endif

		#include <winerror.h>
		#include <wrl/client.h>