06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
|
|
Date: Thu, 29 Apr 2021 18:25:00 +0000
|
|
Subject: Bug 1654112 - Work around the old (<1.5) libxrandr headers on our
|
|
build machines. r=mjf,ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D113830
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c91f12b557a1d23b468c75c4f2fc00eb0f8d541a
|
|
---
|
|
X11/extensions/Xrandr.h | 29 +++++++++++++++++++++++++++++
|
|
1 file changed, 29 insertions(+)
|
|
create mode 100644 X11/extensions/Xrandr.h
|
|
|
|
diff --git a/X11/extensions/Xrandr.h b/X11/extensions/Xrandr.h
|
|
new file mode 100644
|
|
index 0000000000..876e8b4c7f
|
|
--- /dev/null
|
|
+++ b/X11/extensions/Xrandr.h
|
|
@@ -0,0 +1,29 @@
|
|
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
+
|
|
+// Hack to compensate for the old (<1.5) Xrandr development headers on
|
|
+// Mozilla's build boxes.
|
|
+
|
|
+#ifndef _XRANDR_H_WRAPPER_HACK_
|
|
+#define _XRANDR_H_WRAPPER_HACK_
|
|
+
|
|
+#include_next <X11/extensions/Xrandr.h>
|
|
+
|
|
+#if RANDR_MAJOR == 1 && RANDR_MINOR < 5 // defined in randr.h
|
|
+typedef struct _XRRMonitorInfo {
|
|
+ Atom name;
|
|
+ Bool primary;
|
|
+ Bool automatic;
|
|
+ int noutput;
|
|
+ int x;
|
|
+ int y;
|
|
+ int width;
|
|
+ int height;
|
|
+ int mwidth;
|
|
+ int mheight;
|
|
+ RROutput *outputs;
|
|
+} XRRMonitorInfo;
|
|
+#endif
|
|
+
|
|
+#endif // _XRANDR_H_WRAPPER_HACK_
|