From b7a9c36841947c30ad62e85c8fc45d587e65fe8c Mon Sep 17 00:00:00 2001 From: Ben Foppa Date: Fri, 6 Feb 2015 13:16:22 -0500 Subject: [PATCH 1/2] Use crates.io libc. --- Cargo.toml | 1 + sdl2-sys/Cargo.toml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 77bd5c92..0cc24a57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ path = "src/sdl2/lib.rs" [dependencies] bitflags = "0.1" +libc = "*" [dependencies.sdl2-sys] diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml index 0e5cde2c..eb11374c 100644 --- a/sdl2-sys/Cargo.toml +++ b/sdl2-sys/Cargo.toml @@ -13,6 +13,9 @@ build = "build.rs" name = "sdl2-sys" path = "src/lib.rs" +[dependencies] +libc = "*" + [build-dependencies] pkg-config = "0.1.7" From 64c7dfc67c26eea3610078511e5ab18771097bba Mon Sep 17 00:00:00 2001 From: Ben Foppa Date: Sat, 7 Feb 2015 12:10:36 -0500 Subject: [PATCH 2/2] Remove "#![feature(libc)]". --- sdl2-sys/src/lib.rs | 2 +- src/sdl2/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdl2-sys/src/lib.rs b/sdl2-sys/src/lib.rs index 4a0e5546..455a6c28 100644 --- a/sdl2-sys/src/lib.rs +++ b/sdl2-sys/src/lib.rs @@ -1,6 +1,6 @@ #![allow(non_camel_case_types)] -#![feature(core, libc)] +#![feature(core)] extern crate libc; diff --git a/src/sdl2/lib.rs b/src/sdl2/lib.rs index 238b6478..639a4914 100644 --- a/src/sdl2/lib.rs +++ b/src/sdl2/lib.rs @@ -1,7 +1,7 @@ #![crate_name = "sdl2"] #![crate_type = "lib"] -#![feature(slicing_syntax, unsafe_destructor, optin_builtin_traits, std_misc, io, libc, hash, core, collections, rand, path)] +#![feature(slicing_syntax, unsafe_destructor, optin_builtin_traits, std_misc, io, hash, core, collections, rand, path)] extern crate libc; extern crate collections;