31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Mon, 24 Oct 2022 14:03:00 -0500
|
|
Subject: Bug 1797161 - pt3 - add static_assert to ensure we don't include
|
|
task_queue_win.cc in GNU builds. r?ng!
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D160117
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/50b15e036924203147e34ec20e2689fe4a847645
|
|
---
|
|
rtc_base/task_queue_win.cc | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc
|
|
index 513ccd72cc..c9605c6bb2 100644
|
|
--- a/rtc_base/task_queue_win.cc
|
|
+++ b/rtc_base/task_queue_win.cc
|
|
@@ -8,6 +8,15 @@
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
+// GNU - this file should not be included in GNU builds until
|
|
+// win32k API usage is removed. This was once done in Bug 1395259, but
|
|
+// the upstreaming attempt stalled. Until win32k usage is officially
|
|
+// removed upstream, we have reverted to upstream's version of the file
|
|
+// (to reduce or elminate merge conflicts), and a static assert is
|
|
+// placed here to ensure this file isn't accidentally included in the
|
|
+// GNU build.
|
|
+static_assert(false, "This file should not be built, see Bug 1797161.");
|
|
+
|
|
#include "rtc_base/task_queue_win.h"
|
|
|
|
// clang-format off
|