From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 02:47:55 +0200 Subject: Adding upstream version 124.0.1. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/moz-patch-stack/0002.patch | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 third_party/libwebrtc/moz-patch-stack/0002.patch (limited to 'third_party/libwebrtc/moz-patch-stack/0002.patch') diff --git a/third_party/libwebrtc/moz-patch-stack/0002.patch b/third_party/libwebrtc/moz-patch-stack/0002.patch new file mode 100644 index 0000000000..eb8cb95b8d --- /dev/null +++ b/third_party/libwebrtc/moz-patch-stack/0002.patch @@ -0,0 +1,43 @@ +From: Nico Grunbaum +Date: Sat, 13 Feb 2021 04:20:00 -0800 +Subject: Bug 1654112 - Add pid_t to desktop_capture_types.h; r=pehrsons + +Upstreaming bug 1697385 + +Also includes: +Bug 1654112 - Clarifying prev. rev that moved pid_t into the global namespace; r=dminor + +Differential Revision: https://phabricator.services.mozilla.com/D107897 +Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/539b69f0e21118a1898f1ef689577c7193ff7be7 +--- + modules/desktop_capture/desktop_capture_types.h | 4 ++++ + modules/video_capture/video_capture.h | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/modules/desktop_capture/desktop_capture_types.h b/modules/desktop_capture/desktop_capture_types.h +index a4e3e897fd..e777a45f92 100644 +--- a/modules/desktop_capture/desktop_capture_types.h ++++ b/modules/desktop_capture/desktop_capture_types.h +@@ -13,6 +13,10 @@ + + #include + ++#ifdef XP_WIN // Moving this into the global namespace ++typedef int pid_t; // matching what used to be in ++#endif // video_capture_defines.h ++ + namespace webrtc { + + enum class CaptureType { kWindow, kScreen, kAnyScreenContent }; +diff --git a/modules/video_capture/video_capture.h b/modules/video_capture/video_capture.h +index e207598d68..58485f28e9 100644 +--- a/modules/video_capture/video_capture.h ++++ b/modules/video_capture/video_capture.h +@@ -13,6 +13,7 @@ + + #include "api/video/video_rotation.h" + #include "api/video/video_sink_interface.h" ++#include "modules/desktop_capture/desktop_capture_types.h" + #include "modules/video_capture/raw_video_sink_interface.h" + #include "modules/video_capture/video_capture_defines.h" + #include -- cgit v1.2.3