diff --git a/src/sdl2/controller.rs b/src/sdl2/controller.rs index 5db7b8f6..dfcfe83a 100644 --- a/src/sdl2/controller.rs +++ b/src/sdl2/controller.rs @@ -1,5 +1,6 @@ use std::libc::c_int; +#[allow(non_camel_case_types)] pub mod ll { use std::cast; use std::libc::{c_int, c_schar, c_uchar, c_uint, c_void, int16_t, uint8_t}; diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs index fcc47726..861b248c 100644 --- a/src/sdl2/event.rs +++ b/src/sdl2/event.rs @@ -16,6 +16,7 @@ use mouse::{Mouse, MouseState}; use scancode::ScanCode; use video; +#[allow(non_camel_case_types)] pub mod ll { use std::cast; use std::libc::{c_float, c_int, c_schar, c_uint, c_void, int16_t, diff --git a/src/sdl2/gesture.rs b/src/sdl2/gesture.rs index 202c1d57..4926a7a2 100644 --- a/src/sdl2/gesture.rs +++ b/src/sdl2/gesture.rs @@ -1,4 +1,5 @@ +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, int64_t}; use rwops::ll::SDL_RWops; diff --git a/src/sdl2/joystick.rs b/src/sdl2/joystick.rs index 224339bc..581785c5 100644 --- a/src/sdl2/joystick.rs +++ b/src/sdl2/joystick.rs @@ -1,4 +1,5 @@ +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, c_schar, c_void, int32_t, int16_t, int8_t, uint8_t}; diff --git a/src/sdl2/keyboard.rs b/src/sdl2/keyboard.rs index 9d220840..97dcef86 100644 --- a/src/sdl2/keyboard.rs +++ b/src/sdl2/keyboard.rs @@ -9,6 +9,7 @@ use rect::Rect; use scancode::ScanCode; use video::Window; +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, c_schar, c_uint, int32_t, uint8_t, uint16_t, uint32_t}; diff --git a/src/sdl2/mouse.rs b/src/sdl2/mouse.rs index 3a9b8496..aeab5da1 100644 --- a/src/sdl2/mouse.rs +++ b/src/sdl2/mouse.rs @@ -4,6 +4,7 @@ use get_error; use surface; use video; +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, c_uint, c_void, uint8_t, uint32_t}; use surface::ll::SDL_Surface; diff --git a/src/sdl2/pixels.rs b/src/sdl2/pixels.rs index f8d0dbf4..b879425d 100644 --- a/src/sdl2/pixels.rs +++ b/src/sdl2/pixels.rs @@ -1,5 +1,6 @@ use std::rand; +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, uint8_t, uint32_t}; diff --git a/src/sdl2/rect.rs b/src/sdl2/rect.rs index ab85a6b7..1505aa3d 100644 --- a/src/sdl2/rect.rs +++ b/src/sdl2/rect.rs @@ -18,6 +18,7 @@ pub struct Rect { h: i32 } +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int}; diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs index 5463fa84..f8eb989d 100644 --- a/src/sdl2/render.rs +++ b/src/sdl2/render.rs @@ -10,6 +10,7 @@ use rect::Point; use rect::Rect; use std::num::FromPrimitive; +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, c_char, c_void, c_float, c_double}; @@ -215,7 +216,7 @@ enum RendererParent { #[deriving(Eq)] pub struct Renderer { raw: *ll::SDL_Renderer, - parent: RendererParent, + priv parent: RendererParent, owned: bool } diff --git a/src/sdl2/rwops.rs b/src/sdl2/rwops.rs index fc14cab2..6fbc6639 100644 --- a/src/sdl2/rwops.rs +++ b/src/sdl2/rwops.rs @@ -1,3 +1,4 @@ +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_uchar, uint8_t, uint32_t, c_schar}; @@ -12,7 +13,7 @@ pub mod ll { write: *uint8_t, close: *uint8_t, _type: uint32_t, - hidden: SDL_RWops_Anon + priv hidden: SDL_RWops_Anon } extern "C" { diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs index 861836eb..3b6c9690 100644 --- a/src/sdl2/sdl.rs +++ b/src/sdl2/sdl.rs @@ -21,6 +21,7 @@ mod others { extern {} } +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, c_uint, c_schar, uint32_t}; diff --git a/src/sdl2/surface.rs b/src/sdl2/surface.rs index ef1788d1..955d6b71 100644 --- a/src/sdl2/surface.rs +++ b/src/sdl2/surface.rs @@ -6,6 +6,7 @@ use std::libc::c_int; use pixels; use rwops; +#[allow(non_camel_case_types)] pub mod ll { use pixels::ll::SDL_PixelFormat; use pixels::ll::SDL_Palette; diff --git a/src/sdl2/touch.rs b/src/sdl2/touch.rs index a424c928..3f7d6dbf 100644 --- a/src/sdl2/touch.rs +++ b/src/sdl2/touch.rs @@ -10,6 +10,7 @@ pub struct Finger { pressure: f32, } +#[allow(non_camel_case_types)] pub mod ll { use std::libc::{c_int, int64_t}; use touch::Finger; diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs index aa2119a3..7ff3964e 100644 --- a/src/sdl2/video.rs +++ b/src/sdl2/video.rs @@ -11,6 +11,7 @@ use std::num::FromPrimitive; use get_error; +#[allow(non_camel_case_types)] pub mod ll { use rect::Rect; use surface::ll::SDL_Surface;