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 -->
This commit is contained in:
bors-servo 2015-05-06 03:43:02 -05:00
commit b762758366
6 changed files with 6 additions and 2 deletions

View file

@ -11,6 +11,7 @@ dependencies = [
"gfx_tests 0.0.1", "gfx_tests 0.0.1",
"glutin_app 0.0.1", "glutin_app 0.0.1",
"layout 0.0.1", "layout 0.0.1",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",
"net_tests 0.0.1", "net_tests 0.0.1",

View file

@ -103,3 +103,4 @@ optional = true
url = "0.2.16" url = "0.2.16"
time = "0.1.12" time = "0.1.12"
bitflags = "*" bitflags = "*"
libc = "*"

View file

@ -16,7 +16,7 @@
// //
// The `Browser` is fed events from a generic type that implements the // The `Browser` is fed events from a generic type that implements the
// `WindowMethods` trait. // `WindowMethods` trait.
#![feature(libc, thread_local)] #![feature(thread_local)]
extern crate compositing; extern crate compositing;
extern crate devtools; extern crate devtools;

View file

@ -15,7 +15,7 @@
//! //!
//! [glutin]: https://github.com/tomaka/glutin //! [glutin]: https://github.com/tomaka/glutin
#![feature(start, libc)] #![feature(start)]
// The Servo engine // The Servo engine
extern crate servo; extern crate servo;

1
ports/cef/Cargo.lock generated
View file

@ -1059,6 +1059,7 @@ dependencies = [
"gfx 0.0.1", "gfx 0.0.1",
"glutin_app 0.0.1", "glutin_app 0.0.1",
"layout 0.0.1", "layout 0.0.1",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",

1
ports/gonk/Cargo.lock generated
View file

@ -1031,6 +1031,7 @@ dependencies = [
"devtools_traits 0.0.1", "devtools_traits 0.0.1",
"gfx 0.0.1", "gfx 0.0.1",
"layout 0.0.1", "layout 0.0.1",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"net 0.0.1", "net 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",