diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-06 03:43:02 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-06 03:43:02 -0500 |
| commit | b762758366928d15063ce661e75e9494d5720353 (patch) | |
| tree | d2fe279daa4b99f20be2e27ef90bd44c749b1dee | |
| parent | 16a7c792b564a6eab48391865a7060b8dba38284 (diff) | |
| parent | a0e45beae8b8fe21b9f25f538ab776cf159d966d (diff) | |
| download | servo-b762758366928d15063ce661e75e9494d5720353.tar.gz servo-b762758366928d15063ce661e75e9494d5720353.zip | |
Auto merge of #5953 - mbrubeck:libc, r=jdm
r? @Ms2ger
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5953)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 1 | ||||
| -rw-r--r-- | components/servo/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/servo/lib.rs | 2 | ||||
| -rw-r--r-- | components/servo/main.rs | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 1 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 1 |
6 files changed, 6 insertions, 2 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index ac3a7c801c2..060328b59da 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -11,6 +11,7 @@ dependencies = [ "gfx_tests 0.0.1", "glutin_app 0.0.1", "layout 0.0.1", + "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_tests 0.0.1", diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 2a57db1d9ee..7693687e1cb 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -103,3 +103,4 @@ optional = true url = "0.2.16" time = "0.1.12" bitflags = "*" +libc = "*" diff --git a/components/servo/lib.rs b/components/servo/lib.rs index df86056cace..225d8f8a3b5 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -16,7 +16,7 @@ // // The `Browser` is fed events from a generic type that implements the // `WindowMethods` trait. -#![feature(libc, thread_local)] +#![feature(thread_local)] extern crate compositing; extern crate devtools; diff --git a/components/servo/main.rs b/components/servo/main.rs index 6de2b2d1399..0358a971b3e 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -15,7 +15,7 @@ //! //! [glutin]: https://github.com/tomaka/glutin -#![feature(start, libc)] +#![feature(start)] // The Servo engine extern crate servo; diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b3cfd2544cf..5ccf477f827 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1059,6 +1059,7 @@ dependencies = [ "gfx 0.0.1", "glutin_app 0.0.1", "layout 0.0.1", + "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index f3f191d8532..5b249c86bfc 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1031,6 +1031,7 @@ dependencies = [ "devtools_traits 0.0.1", "gfx 0.0.1", "layout 0.0.1", + "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", |