Skip to content

Commit ddb4bfb

Browse files
Bug 2005998 - Fix rlbox implicit includes r=cpeterson
Backport of PLSysSec/rlbox#59 Differential Revision: https://phabricator.services.mozilla.com/D276422
1 parent 375743d commit ddb4bfb

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/include/rlbox_sandbox.hpp b/include/rlbox_sandbox.hpp
2+
index 63995c89adf2e..eae1d2aa19da2 100644
3+
--- a/include/rlbox_sandbox.hpp
4+
+++ b/include/rlbox_sandbox.hpp
5+
@@ -11,12 +11,12 @@
6+
#include <limits>
7+
#include <map>
8+
#include <mutex>
9+
+#include <string>
10+
#ifndef RLBOX_USE_CUSTOM_SHARED_LOCK
11+
# include <shared_mutex>
12+
#endif
13+
#ifdef RLBOX_MEASURE_TRANSITION_TIMES
14+
# include <sstream>
15+
-# include <string>
16+
#endif
17+
#include <stdint.h>
18+
#include <type_traits>

third_party/rlbox/include/rlbox_sandbox.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#include <limits>
1212
#include <map>
1313
#include <mutex>
14+
#include <string>
1415
#ifndef RLBOX_USE_CUSTOM_SHARED_LOCK
1516
# include <shared_mutex>
1617
#endif
1718
#ifdef RLBOX_MEASURE_TRANSITION_TIMES
1819
# include <sstream>
19-
# include <string>
2020
#endif
2121
#include <stdint.h>
2222
#include <type_traits>

third_party/rlbox/moz.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ vendoring:
3232
from: '{vendor_dir}/code/include'
3333
to: '{vendor_dir}/include'
3434

35+
patches:
36+
- fix-includes.patch
37+
3538
updatebot:
3639
maintainer-phab: shravanrn
3740
maintainer-bz: shravanrn@gmail.com

0 commit comments

Comments
 (0)