1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From: Mike Hommey <mh@glandium.org>
Date: Wed, 29 Jun 2022 07:30:11 +0900
Subject: Work around build failure with newer cbindgen. bz#1773259
---
build/moz.configure/bindgen.configure | 9 +++++++++
gfx/webrender_bindings/webrender_ffi.h | 2 ++
2 files changed, 11 insertions(+)
diff --git a/build/moz.configure/bindgen.configure b/build/moz.configure/bindgen.configure
index 193e1ad..660090a 100644
--- a/build/moz.configure/bindgen.configure
+++ b/build/moz.configure/bindgen.configure
@@ -91,6 +91,15 @@ def cbindgen(cbindgen_override, bootstrap_search_path, rust_search_path):
set_config("CBINDGEN", cbindgen)
+set_define(
+ "CBINDGEN_0_24",
+ True,
+ when=depends(cbindgen)(
+ lambda c: Version(check_cmd_output(c, "--version").strip().split(" ")[1])
+ >= "0.24.0"
+ ),
+)
+
# Bindgen can use rustfmt to format Rust file, but it's not required.
option(env="RUSTFMT", nargs=1, help="Path to the rustfmt program")
diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h
index b1d67b1..ab3cfef 100644
--- a/gfx/webrender_bindings/webrender_ffi.h
+++ b/gfx/webrender_bindings/webrender_ffi.h
@@ -73,7 +73,9 @@ struct WrPipelineInfo;
struct WrPipelineIdAndEpoch;
using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
+#ifndef CBINDGEN_0_24
const uint64_t ROOT_CLIP_CHAIN = ~0;
+#endif
} // namespace wr
} // namespace mozilla
|
