diff options
| author | Samson <16504129+sagudev@users.noreply.github.com> | 2023-09-11 10:23:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-11 08:23:05 +0000 |
| commit | 59d134133fb5474f510dd289c212ad0e78564642 (patch) | |
| tree | 65443ed51e6c0ba2e14f8fde7403ae1c521e33bd /components/script/script_runtime.rs | |
| parent | 9b1247b20f2de6bbba39efff49eabc63e865ce2e (diff) | |
| download | servo-59d134133fb5474f510dd289c212ad0e78564642.tar.gz servo-59d134133fb5474f510dd289c212ad0e78564642.zip | |
Use MozTools 4 and update mozjs (#30326)
* Update mozjs
* moztools4 in bootstrap
* no autoconf
* tidy
* switch to servo-build-deps
* update mozjs for real
* glue mozjs
* fmt
* move to servo/mozjs
Diffstat (limited to 'components/script/script_runtime.rs')
| -rw-r--r-- | components/script/script_runtime.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index 3db34ea97c4..3d88c50a671 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -37,6 +37,7 @@ use crate::script_thread::trace_thread; use crate::task::TaskBox; use crate::task_source::networking::NetworkingTaskSource; use crate::task_source::{TaskSource, TaskSourceName}; +use core::ffi::c_char; use js::glue::{CollectServoSizes, CreateJobQueue, DeleteJobQueue, DispatchableRun}; use js::glue::{JobQueueTraps, RUST_js_GetErrorMessage, SetBuildId, StreamConsumerConsumeChunk}; use js::glue::{ @@ -836,7 +837,7 @@ unsafe extern "C" fn trace_rust_roots(tr: *mut JSTracer, _data: *mut os::raw::c_ #[allow(unsafe_code)] unsafe extern "C" fn servo_build_id(build_id: *mut BuildIdCharVector) -> bool { let servo_id = b"Servo\0"; - SetBuildId(build_id, &servo_id[0], servo_id.len()) + SetBuildId(build_id, servo_id[0] as *const c_char, servo_id.len()) } #[allow(unsafe_code)] |