Merge pull request #125 from mvdnes/schar_moved

c_schar is no longer in libc base export
brson · Apr 17, 2014 · 804adf6 · 804adf6
2 parents 81afef5 + 00366d7
commit 804adf6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/src/sdl/cd.rs b/src/sdl/cd.rs
@@ -7,7 +7,8 @@ use get_error;
 pub mod ll {
 	#![allow(non_camel_case_types)]
 
-	use libc::{c_int, c_schar, uint8_t, uint16_t, uint32_t};
+	use libc::{c_int, uint8_t, uint16_t, uint32_t};
+	use libc::types::os::arch::c95::c_schar;
 
 	pub type CDstatus = c_int;
 

diff --git a/src/sdl/event.rs b/src/sdl/event.rs
@@ -8,7 +8,8 @@ pub mod ll {
     #![allow(non_camel_case_types)]
 
     use std::cast;
-    use libc::{c_void, c_int, c_uint, c_uchar, c_schar, uint8_t, uint16_t, int16_t};
+    use libc::{c_void, c_int, c_uint, c_uchar, uint8_t, uint16_t, int16_t};
+    use libc::types::os::arch::c95::c_schar;
 
     pub type SDLKey = c_uint;
     pub type SDLMod = c_uint;

diff --git a/src/sdl/joy.rs b/src/sdl/joy.rs
@@ -7,7 +7,8 @@ use get_error;
 pub mod ll {
 	#![allow(non_camel_case_types)]
 
-	use libc::{c_void, c_int, c_schar, uint8_t, int16_t};
+	use libc::{c_void, c_int, uint8_t, int16_t};
+	use libc::types::os::arch::c95::c_schar;
 
 	pub type SDL_Joystick = c_void;
 

diff --git a/src/sdl/sdl.rs b/src/sdl/sdl.rs
@@ -22,7 +22,8 @@ mod others {
 pub mod ll {
     #![allow(non_camel_case_types)]
 
-    use libc::{c_int, c_uint, c_schar, uint32_t};
+    use libc::{c_int, c_uint, uint32_t};
+    use libc::types::os::arch::c95::c_schar;
 
     pub type SDL_errorcode = c_uint;
     pub static SDL_ENOMEM: SDL_errorcode = 0;

diff --git a/src/sdl/video.rs b/src/sdl/video.rs
@@ -13,8 +13,9 @@ pub mod ll {
 
     use Rect;
 
-    use libc::{c_void, c_uint, c_int, c_float, c_schar, c_uchar, uint8_t, uint16_t};
+    use libc::{c_void, c_uint, c_int, c_float, c_uchar, uint8_t, uint16_t};
     use libc::{uint32_t, int32_t};
+    use libc::types::os::arch::c95::c_schar;
 
     pub type SDL_Rect = Rect;
 

diff --git a/src/sdl/wm.rs b/src/sdl/wm.rs
@@ -9,7 +9,8 @@ pub mod ll {
 
 	use video::ll::SDL_Surface;
 
-	use libc::{c_schar, uint8_t, c_int};
+	use libc::{uint8_t, c_int};
+	use libc::types::os::arch::c95::c_schar;
 
 	pub type SDL_GrabMode = c_int;
 

diff --git a/src/sdl_image/lib.rs b/src/sdl_image/lib.rs
@@ -27,7 +27,8 @@ pub mod ll {
 
     use sdl::video::ll::SDL_Surface;
 
-    use libc::{c_int, c_uint, c_schar};
+    use libc::{c_int, c_uint};
+    use libc::types::os::arch::c95::c_schar;
 
     pub type IMG_InitFlags = c_uint;