Skip to content

Commit 804adf6

Browse files
committed
Merge pull request #125 from mvdnes/schar_moved
c_schar is no longer in libc base export
2 parents 81afef5 + 00366d7 commit 804adf6

File tree

7 files changed

+14
-7
lines changed

7 files changed

+14
-7
lines changed

Diff for: src/sdl/cd.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ use get_error;
77
pub mod ll {
88
#![allow(non_camel_case_types)]
99

10-
use libc::{c_int, c_schar, uint8_t, uint16_t, uint32_t};
10+
use libc::{c_int, uint8_t, uint16_t, uint32_t};
11+
use libc::types::os::arch::c95::c_schar;
1112

1213
pub type CDstatus = c_int;
1314

Diff for: src/sdl/event.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ pub mod ll {
88
#![allow(non_camel_case_types)]
99

1010
use std::cast;
11-
use libc::{c_void, c_int, c_uint, c_uchar, c_schar, uint8_t, uint16_t, int16_t};
11+
use libc::{c_void, c_int, c_uint, c_uchar, uint8_t, uint16_t, int16_t};
12+
use libc::types::os::arch::c95::c_schar;
1213

1314
pub type SDLKey = c_uint;
1415
pub type SDLMod = c_uint;

Diff for: src/sdl/joy.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ use get_error;
77
pub mod ll {
88
#![allow(non_camel_case_types)]
99

10-
use libc::{c_void, c_int, c_schar, uint8_t, int16_t};
10+
use libc::{c_void, c_int, uint8_t, int16_t};
11+
use libc::types::os::arch::c95::c_schar;
1112

1213
pub type SDL_Joystick = c_void;
1314

Diff for: src/sdl/sdl.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ mod others {
2222
pub mod ll {
2323
#![allow(non_camel_case_types)]
2424

25-
use libc::{c_int, c_uint, c_schar, uint32_t};
25+
use libc::{c_int, c_uint, uint32_t};
26+
use libc::types::os::arch::c95::c_schar;
2627

2728
pub type SDL_errorcode = c_uint;
2829
pub static SDL_ENOMEM: SDL_errorcode = 0;

Diff for: src/sdl/video.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ pub mod ll {
1313

1414
use Rect;
1515

16-
use libc::{c_void, c_uint, c_int, c_float, c_schar, c_uchar, uint8_t, uint16_t};
16+
use libc::{c_void, c_uint, c_int, c_float, c_uchar, uint8_t, uint16_t};
1717
use libc::{uint32_t, int32_t};
18+
use libc::types::os::arch::c95::c_schar;
1819

1920
pub type SDL_Rect = Rect;
2021

Diff for: src/sdl/wm.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ pub mod ll {
99

1010
use video::ll::SDL_Surface;
1111

12-
use libc::{c_schar, uint8_t, c_int};
12+
use libc::{uint8_t, c_int};
13+
use libc::types::os::arch::c95::c_schar;
1314

1415
pub type SDL_GrabMode = c_int;
1516

Diff for: src/sdl_image/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ pub mod ll {
2727

2828
use sdl::video::ll::SDL_Surface;
2929

30-
use libc::{c_int, c_uint, c_schar};
30+
use libc::{c_int, c_uint};
31+
use libc::types::os::arch::c95::c_schar;
3132

3233
pub type IMG_InitFlags = c_uint;
3334

0 commit comments

Comments
 (0)