43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
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 <stdint.h>
|
|
|
|
+#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 f31b239c71..7279bed476 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 <set>
|