tor-browser

commit ddb4bfba50cb563324e687403164ecc718ea1211
parent 375743d56b88db26ae735f2835c8809380b3178a
Author: serge-sans-paille <sguelton@mozilla.com>
Date:   Tue, 16 Dec 2025 18:55:48 +0000

Bug 2005998 - Fix rlbox implicit includes r=cpeterson

Backport of https://github.com/PLSysSec/rlbox/pull/59

Differential Revision: https://phabricator.services.mozilla.com/D276422

Diffstat:
A
third_party/rlbox/fix-includes.patch
 | 
18
++++++++++++++++++
M
third_party/rlbox/include/rlbox_sandbox.hpp
 | 
2
+-
M
third_party/rlbox/moz.yaml
 | 
3
+++

3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/third_party/rlbox/fix-includes.patch b/third_party/rlbox/fix-includes.patch
@@ -0,0 +1,18 @@
+diff --git a/include/rlbox_sandbox.hpp b/include/rlbox_sandbox.hpp
+index 63995c89adf2e..eae1d2aa19da2 100644
+--- a/include/rlbox_sandbox.hpp
++++ b/include/rlbox_sandbox.hpp
+@@ -11,12 +11,12 @@
+ #include <limits>
+ #include <map>
+ #include <mutex>
++#include <string>
+ #ifndef RLBOX_USE_CUSTOM_SHARED_LOCK
+ #  include <shared_mutex>
+ #endif
+ #ifdef RLBOX_MEASURE_TRANSITION_TIMES
+ #  include <sstream>
+-#  include <string>
+ #endif
+ #include <stdint.h>
+ #include <type_traits>
diff --git a/third_party/rlbox/include/rlbox_sandbox.hpp b/third_party/rlbox/include/rlbox_sandbox.hpp
@@ -11,12 +11,12 @@
 #include <limits>
 #include <map>
 #include <mutex>
+#include <string>
 #ifndef RLBOX_USE_CUSTOM_SHARED_LOCK
 #  include <shared_mutex>
 #endif
 #ifdef RLBOX_MEASURE_TRANSITION_TIMES
 #  include <sstream>
-#  include <string>
 #endif
 #include <stdint.h>
 #include <type_traits>
diff --git a/third_party/rlbox/moz.yaml b/third_party/rlbox/moz.yaml
@@ -32,6 +32,9 @@ vendoring:
       from: '{vendor_dir}/code/include'
       to: '{vendor_dir}/include'
 
+  patches:
+    - fix-includes.patch
+
 updatebot:
   maintainer-phab: shravanrn
   maintainer-bz: shravanrn@gmail.com