diff options
| author | Lars Bergstrom <lars@lars.com> | 2015-12-03 18:50:58 -0600 |
|---|---|---|
| committer | Lars Bergstrom <lars@lars.com> | 2016-01-20 08:38:27 -0600 |
| commit | 095658e098ea695fef651f5b51a0081cfeb94f32 (patch) | |
| tree | be75230da2a8b02cf27b1514f8317d116a7b2158 /components | |
| parent | 5b845cbf79a66353876ba82de769337b17f3faec (diff) | |
| download | servo-095658e098ea695fef651f5b51a0081cfeb94f32.tar.gz servo-095658e098ea695fef651f5b51a0081cfeb94f32.zip | |
Cargo updates and small workqueue change
Diffstat (limited to 'components')
| -rw-r--r-- | components/gfx/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/servo/Cargo.lock | 19 | ||||
| -rw-r--r-- | components/util/workqueue.rs | 3 |
3 files changed, 21 insertions, 3 deletions
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 6350288e590..d2636f44113 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -84,7 +84,7 @@ servo-fontconfig = "0.2" [target.arm-linux-androideabi.dependencies] servo-fontconfig = "0.2" -[target.x86_64-pc-windows-gnu.dependencies.fontconfig] +[target.x86_64-pc-windows-gnu.dependencies.servo-fontconfig] git = "https://github.com/servo/rust-fontconfig" [target.i686-unknown-linux-gnu.dependencies.freetype] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 13b74a9de9c..693baf4b409 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -901,6 +901,15 @@ dependencies = [ [[package]] name = "kernel32-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "kernel32-sys" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1640,6 +1649,15 @@ dependencies = [ [[package]] name = "servo-fontconfig" version = "0.2.0" +source = "git+https://github.com/servo/rust-fontconfig#0dd4c4496295ac58ef2f8248d896b19a369767d4" +dependencies = [ + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-fontconfig-sys 2.11.2-really.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "servo-fontconfig" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1961,6 +1979,7 @@ dependencies = [ "hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/servo/ipc-channel)", "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", + "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.2.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/util/workqueue.rs b/components/util/workqueue.rs index 2ed4ef1dbeb..c46039b6068 100644 --- a/components/util/workqueue.rs +++ b/components/util/workqueue.rs @@ -11,9 +11,8 @@ extern crate kernel32; use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker}; -use libc::usleep; #[cfg(not(windows))] -use libc::funcs::posix88::unistd::usleep; +use libc::usleep; use rand::{Rng, XorShiftRng, weak_rng}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::mpsc::{Receiver, Sender, channel}; |