From faafab27bb70214a9cdbed14a7bf40740c0d7709 Mon Sep 17 00:00:00 2001
From: Tony Aldridge <zaragopha@hotmail.com>
Date: Wed, 25 Nov 2015 15:16:41 +0000
Subject: [PATCH 1/2] Make various functions prefer c_char over native Rust
 u8/i8, for cross-platform compilation

---
 Cargo.toml                    |  4 ++--
 README.md                     |  2 +-
 src/sdl2/audio.rs             | 10 +++++-----
 src/sdl2/clipboard.rs         |  5 +++--
 src/sdl2/controller.rs        | 10 +++++-----
 src/sdl2/event.rs             |  6 +++---
 src/sdl2/filesystem.rs        |  7 ++++---
 src/sdl2/hint.rs              |  9 +++++----
 src/sdl2/joystick.rs          |  6 +++---
 src/sdl2/keyboard/keycode.rs  |  5 +++--
 src/sdl2/keyboard/scancode.rs |  5 +++--
 src/sdl2/messagebox.rs        |  5 +++--
 src/sdl2/render.rs            |  2 +-
 src/sdl2/rwops.rs             |  4 ++--
 src/sdl2/sdl.rs               |  5 +++--
 src/sdl2/version.rs           |  2 +-
 src/sdl2/video.rs             | 20 ++++++++++----------
 17 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8fb11485..7eef800a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ name    = "sdl2"
 description = "SDL2 bindings for Rust"
 repository = "https://github.com/AngryLawyer/rust-sdl2"
 documentation = "http://angrylawyer.github.io/rust-sdl2/sdl2/"
-version = "0.11.0"
+version = "0.12.0"
 license = "MIT"
 authors = [ "Tony Aldridge <tony@angry-lawyer.com>" ]
 keywords = ["SDL", "windowing", "graphics"]
@@ -16,7 +16,7 @@ path       = "src/sdl2/lib.rs"
 
 [dependencies]
 num = "0.1"
-bitflags = "0.3.2"
+bitflags = "0.3"
 libc = "0.2"
 rand = "0.3"
 
diff --git a/README.md b/README.md
index be2b0659..fcdce99b 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ download through Crates.io:
 
 ```toml
     [dependencies]
-    sdl2 = "0.11"
+    sdl2 = "0.12"
 ```
 
 Alternatively, pull it from GitHub
diff --git a/src/sdl2/audio.rs b/src/sdl2/audio.rs
index b9e7a9fa..99e78ed3 100644
--- a/src/sdl2/audio.rs
+++ b/src/sdl2/audio.rs
@@ -51,7 +51,7 @@
 //! ```
 use std::ffi::{CStr, CString};
 use num::FromPrimitive;
-use libc::{c_int, c_void, uint8_t};
+use libc::{c_int, c_void, uint8_t, c_char};
 use std::ops::{Deref, DerefMut};
 use std::path::Path;
 use std::marker::PhantomData;
@@ -80,7 +80,7 @@ impl AudioSubsystem {
             let buf = ll::SDL_GetCurrentAudioDriver();
             assert!(!buf.is_null());
 
-            str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
+            str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
         }
     }
 
@@ -100,7 +100,7 @@ impl AudioSubsystem {
             if dev_name.is_null() {
                 Err(get_error())
             } else {
-                Ok(String::from_utf8_lossy(CStr::from_ptr(dev_name).to_bytes()).to_string())
+                Ok(String::from_utf8_lossy(CStr::from_ptr(dev_name as *const i8).to_bytes()).to_string())
             }
         }
     }
@@ -221,7 +221,7 @@ impl Iterator for DriverIterator {
                 assert!(!buf.is_null());
                 self.index += 1;
 
-                Some(str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap())
+                Some(str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap())
             }
         }
     }
@@ -480,7 +480,7 @@ impl<CB: AudioCallback> AudioDevice<CB> {
             let device_ptr = device.map_or(null(), |s| s.as_ptr());
 
             let iscapture_flag = 0;
-            let device_id = ll::SDL_OpenAudioDevice(device_ptr, iscapture_flag, &desired, &mut obtained, 0);
+            let device_id = ll::SDL_OpenAudioDevice(device_ptr as *const c_char, iscapture_flag, &desired, &mut obtained, 0);
             match device_id {
                 0 => {
                     Err(get_error())
diff --git a/src/sdl2/clipboard.rs b/src/sdl2/clipboard.rs
index 91152e97..3c330f29 100644
--- a/src/sdl2/clipboard.rs
+++ b/src/sdl2/clipboard.rs
@@ -1,4 +1,5 @@
 use std::ffi::{CString, CStr};
+use libc::c_char;
 use SdlResult;
 use get_error;
 
@@ -31,7 +32,7 @@ impl ClipboardUtil {
     pub fn set_clipboard_text(&self, text: &str) -> SdlResult<()> {
         unsafe {
             let text = CString::new(text).unwrap();
-            let result = ll::SDL_SetClipboardText(text.as_ptr());
+            let result = ll::SDL_SetClipboardText(text.as_ptr() as *const c_char);
 
             if result == 0 {
                 Err(get_error())
@@ -48,7 +49,7 @@ impl ClipboardUtil {
             if buf.is_null() {
                 Err(get_error())
             } else {
-                Ok(String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).into_owned())
+                Ok(String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).into_owned())
             }
         }
     }
diff --git a/src/sdl2/controller.rs b/src/sdl2/controller.rs
index d5676442..58de8828 100644
--- a/src/sdl2/controller.rs
+++ b/src/sdl2/controller.rs
@@ -74,7 +74,7 @@ impl GameControllerSubsystem {
     pub fn add_mapping(&self, mapping: &str) -> SdlResult<MappingStatus> {
         let mapping = try!(CString::new(mapping).unwrap_or_sdlresult());
 
-        let result = unsafe { ll::SDL_GameControllerAddMapping(mapping.as_ptr()) };
+        let result = unsafe { ll::SDL_GameControllerAddMapping(mapping.as_ptr() as *const c_char) };
 
         match result {
             1 => Ok(MappingStatus::Added),
@@ -112,7 +112,7 @@ impl Axis {
     /// used by the game controller mapping strings.
     pub fn from_string(axis: &str) -> Option<Axis> {
         let id = match CString::new(axis) {
-            Ok(axis) => unsafe { ll::SDL_GameControllerGetAxisFromString(axis.as_ptr()) },
+            Ok(axis) => unsafe { ll::SDL_GameControllerGetAxisFromString(axis.as_ptr() as *const c_char) },
             // string contains a nul byte - it won't match anything.
             Err(_) => ll::SDL_CONTROLLER_AXIS_INVALID
         };
@@ -169,7 +169,7 @@ impl Button {
     /// used by the game controller mapping strings.
     pub fn from_string(button: &str) -> Option<Button> {
         let id = match CString::new(button) {
-            Ok(button) => unsafe { ll::SDL_GameControllerGetButtonFromString(button.as_ptr()) },
+            Ok(button) => unsafe { ll::SDL_GameControllerGetButtonFromString(button.as_ptr() as *const c_char) },
             // string contains a nul byte - it won't match anything.
             Err(_) => ll::SDL_CONTROLLER_BUTTON_INVALID
         };
@@ -286,7 +286,7 @@ fn c_str_to_string(c_str: *const c_char) -> String {
     if c_str.is_null() {
         String::new()
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
 
         String::from_utf8_lossy(bytes).to_string()
     }
@@ -298,7 +298,7 @@ fn c_str_to_string_or_err(c_str: *const c_char) -> SdlResult<String> {
     if c_str.is_null() {
         Err(get_error())
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
 
         Ok(String::from_utf8_lossy(bytes).to_string())
     }
diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
index 38885817..13bdc7ec 100644
--- a/src/sdl2/event.rs
+++ b/src/sdl2/event.rs
@@ -662,7 +662,7 @@ impl Event {
 
                 let text = String::from_utf8_lossy(
                         &event.text.iter()
-                            .take_while(|&b| (*b) != 0i8)
+                            .take_while(|&b| (*b) != 0)
                             .map(|&b| b as u8)
                             .collect::<Vec<u8>>()
                     ).to_owned().into_owned();
@@ -679,7 +679,7 @@ impl Event {
 
                 let text = String::from_utf8_lossy(
                         &event.text.iter()
-                            .take_while(|&b| (*b) != 0i8)
+                            .take_while(|&b| (*b) != 0)
                             .map(|&b| b as u8)
                             .collect::<Vec<u8>>()
                     ).to_owned().into_owned();
@@ -937,7 +937,7 @@ impl Event {
             EventType::DropFile => {
                 let ref event = *raw.drop();
 
-                let buf = CStr::from_ptr(event.file).to_bytes();
+                let buf = CStr::from_ptr(event.file as *const i8).to_bytes();
                 let text = String::from_utf8_lossy(buf).to_string();
                 ll::SDL_free(event.file as *mut c_void);
 
diff --git a/src/sdl2/filesystem.rs b/src/sdl2/filesystem.rs
index 2c1f3d84..78f586cb 100644
--- a/src/sdl2/filesystem.rs
+++ b/src/sdl2/filesystem.rs
@@ -2,13 +2,14 @@ use std::ffi::{CStr, CString};
 use SdlResult;
 use get_error;
 use util::CStringExt;
+use libc::c_char;
 
 use sys::filesystem as ll;
 
 pub fn base_path() -> SdlResult<String> {
     let result = unsafe {
         let buf = ll::SDL_GetBasePath();
-        String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).to_string()
+        String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).to_string()
     };
 
     if result.len() == 0 {
@@ -22,8 +23,8 @@ pub fn pref_path(org: &str, app: &str) -> SdlResult<String> {
     let result = unsafe {
         let org = try!(CString::new(org).unwrap_or_sdlresult());
         let app = try!(CString::new(app).unwrap_or_sdlresult());
-        let buf = ll::SDL_GetPrefPath(org.as_ptr(), app.as_ptr());
-        String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).to_string()
+        let buf = ll::SDL_GetPrefPath(org.as_ptr() as *const c_char, app.as_ptr() as *const c_char);
+        String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).to_string()
     };
 
     if result.len() == 0 {
diff --git a/src/sdl2/hint.rs b/src/sdl2/hint.rs
index bdb62a86..92c86ad1 100644
--- a/src/sdl2/hint.rs
+++ b/src/sdl2/hint.rs
@@ -1,6 +1,7 @@
 use std::ffi::{CString, CStr};
 use sys::hint as ll;
 use std::ptr;
+use libc::c_char;
 
 pub enum Hint {
     Default,
@@ -12,7 +13,7 @@ pub fn set(name: &str, value: &str) -> bool{
     let name = CString::new(name).unwrap();
     let value = CString::new(value).unwrap();
     unsafe {
-        ll::SDL_SetHint(name.as_ptr(), value.as_ptr()) == 1
+        ll::SDL_SetHint(name.as_ptr() as *const c_char, value.as_ptr() as *const c_char) == 1
     }
 }
 
@@ -22,12 +23,12 @@ pub fn get(name: &str) -> Option<String> {
     let name = CString::new(name).unwrap();
 
     unsafe {
-        let res = ll::SDL_GetHint(name.as_ptr());
+        let res = ll::SDL_GetHint(name.as_ptr() as *const c_char);
 
         if res == ptr::null_mut() {
             None
         } else {
-            Some(str::from_utf8(CStr::from_ptr(res).to_bytes()).unwrap().to_owned())
+            Some(str::from_utf8(CStr::from_ptr(res as *const i8).to_bytes()).unwrap().to_owned())
         }
     }
 }
@@ -43,6 +44,6 @@ pub fn set_with_priority(name: &str, value: &str, priority: Hint) -> bool {
     };
 
     unsafe {
-        ll::SDL_SetHintWithPriority(name.as_ptr(), value.as_ptr(), priority_val) == 1
+        ll::SDL_SetHintWithPriority(name.as_ptr() as *const c_char, value.as_ptr() as *const c_char, priority_val) == 1
     }
 }
diff --git a/src/sdl2/joystick.rs b/src/sdl2/joystick.rs
index a4d4c443..06b8eb28 100644
--- a/src/sdl2/joystick.rs
+++ b/src/sdl2/joystick.rs
@@ -293,7 +293,7 @@ impl Guid {
     pub fn from_string(guid: &str) -> Result<Guid, NulError> {
         let guid = try!(CString::new(guid));
 
-        let raw = unsafe { ll::SDL_JoystickGetGUIDFromString(guid.as_ptr()) };
+        let raw = unsafe { ll::SDL_JoystickGetGUIDFromString(guid.as_ptr() as *const c_char) };
 
         Ok(Guid { raw: raw })
     }
@@ -381,7 +381,7 @@ fn c_str_to_string(c_str: *const c_char) -> String {
     if c_str.is_null() {
         String::new()
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
 
         String::from_utf8_lossy(bytes).to_string()
     }
@@ -393,7 +393,7 @@ fn c_str_to_string_or_err(c_str: *const c_char) -> SdlResult<String> {
     if c_str.is_null() {
         Err(get_error())
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
 
         Ok(String::from_utf8_lossy(bytes).to_string())
     }
diff --git a/src/sdl2/keyboard/keycode.rs b/src/sdl2/keyboard/keycode.rs
index f64c448d..eb7874c3 100644
--- a/src/sdl2/keyboard/keycode.rs
+++ b/src/sdl2/keyboard/keycode.rs
@@ -1,5 +1,6 @@
 use num::{ToPrimitive, FromPrimitive};
 use std::ffi::{CString, CStr};
+use libc::c_char;
 
 use sys::keycode as ll;
 
@@ -533,7 +534,7 @@ impl Keycode {
     pub fn from_name(name: &str) -> Option<Keycode> {
         unsafe {
             match CString::new(name) {
-                Ok(name) => match ::sys::keyboard::SDL_GetKeyFromName(name.as_ptr()) {
+                Ok(name) => match ::sys::keyboard::SDL_GetKeyFromName(name.as_ptr() as *const c_char) {
                     ll::SDLK_UNKNOWN => None,
                     keycode_id => Some(FromPrimitive::from_isize(keycode_id as isize).unwrap())
                 },
@@ -548,7 +549,7 @@ impl Keycode {
         // Knowing this, we must always return a new string.
         unsafe {
             let buf = ::sys::keyboard::SDL_GetKeyName(self as i32);
-            String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).to_string()
+            String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).to_string()
         }
     }
 }
diff --git a/src/sdl2/keyboard/scancode.rs b/src/sdl2/keyboard/scancode.rs
index 5071254e..17199a51 100644
--- a/src/sdl2/keyboard/scancode.rs
+++ b/src/sdl2/keyboard/scancode.rs
@@ -1,5 +1,6 @@
 use num::{ToPrimitive, FromPrimitive};
 use std::ffi::{CString, CStr};
+use libc::c_char;
 
 use sys::scancode as ll;
 
@@ -543,7 +544,7 @@ impl Scancode {
     pub fn from_name(name: &str) -> Option<Scancode> {
         unsafe {
             match CString::new(name) {
-                Ok(name) => match ::sys::keyboard::SDL_GetScancodeFromName(name.as_ptr()) {
+                Ok(name) => match ::sys::keyboard::SDL_GetScancodeFromName(name.as_ptr() as *const c_char) {
                     ll::SDL_SCANCODE_UNKNOWN => None,
                     scancode_id => Some(FromPrimitive::from_isize(scancode_id as isize).unwrap())
                 },
@@ -558,7 +559,7 @@ impl Scancode {
         // Knowing this, we can always return a string slice.
         unsafe {
             let buf = ::sys::keyboard::SDL_GetScancodeName(self as u32);
-            ::std::str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
+            ::std::str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
         }
     }
 }
diff --git a/src/sdl2/messagebox.rs b/src/sdl2/messagebox.rs
index dd3e05a2..fefc3b44 100644
--- a/src/sdl2/messagebox.rs
+++ b/src/sdl2/messagebox.rs
@@ -1,5 +1,6 @@
 use std::ffi::CString;
 use std::ptr;
+use libc::c_char;
 
 use video::Window;
 use get_error;
@@ -21,8 +22,8 @@ pub fn show_simple_message_box(flags: MessageBoxFlag, title: &str, message: &str
         let title = CString::new(title).remove_nul();
         let message = CString::new(message).remove_nul();
         ll::SDL_ShowSimpleMessageBox(flags.bits(),
-                                     title.as_ptr(),
-                                     message.as_ptr(),
+                                     title.as_ptr() as *const c_char,
+                                     message.as_ptr() as *const c_char,
                                      window.map_or(ptr::null_mut(), |win| win.raw()))
     } == 0;
 
diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs
index 6b0cb6c7..2591563c 100644
--- a/src/sdl2/render.rs
+++ b/src/sdl2/render.rs
@@ -115,7 +115,7 @@ impl RendererInfo {
         }).collect();
 
         // The driver name is always a static string, compiled into SDL2.
-        let name = str::from_utf8(CStr::from_ptr(info.name).to_bytes()).unwrap();
+        let name = str::from_utf8(CStr::from_ptr(info.name as *const i8).to_bytes()).unwrap();
 
         RendererInfo {
             name: name,
diff --git a/src/sdl2/rwops.rs b/src/sdl2/rwops.rs
index 9348f79b..7754a07e 100644
--- a/src/sdl2/rwops.rs
+++ b/src/sdl2/rwops.rs
@@ -2,7 +2,7 @@ use std::ffi::CString;
 use std::io;
 use std::path::Path;
 use std::marker::PhantomData;
-use libc::{c_void, c_int, size_t};
+use libc::{c_void, c_int, size_t, c_char};
 use get_error;
 use SdlResult;
 
@@ -29,7 +29,7 @@ impl<'a> RWops<'a> {
         let raw = unsafe {
             let path_c = CString::new(path.as_ref().to_str().unwrap()).unwrap();
             let mode_c = CString::new(mode).unwrap();
-            ll::SDL_RWFromFile(path_c.as_ptr(), mode_c.as_ptr())
+            ll::SDL_RWFromFile(path_c.as_ptr() as *const c_char, mode_c.as_ptr() as *const c_char)
         };
 
         if raw.is_null() {
diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs
index e47f895f..04cdf4ff 100644
--- a/src/sdl2/sdl.rs
+++ b/src/sdl2/sdl.rs
@@ -2,6 +2,7 @@ use std::ffi::{CStr, CString};
 use std::rc::Rc;
 use std::fmt;
 use std::error;
+use libc::c_char;
 
 use sys::sdl as ll;
 use util::CStringExt;
@@ -309,13 +310,13 @@ pub fn init() -> SdlResult<Sdl> { Sdl::new() }
 pub fn get_error() -> ErrorMessage {
     unsafe {
         let err = ll::SDL_GetError();
-        ErrorMessage(String::from_utf8_lossy(CStr::from_ptr(err).to_bytes()).to_string())
+        ErrorMessage(String::from_utf8_lossy(CStr::from_ptr(err as *const i8).to_bytes()).to_string())
     }
 }
 
 pub fn set_error(err: &str) {
     let err = CString::new(err).remove_nul();
-    unsafe { ll::SDL_SetError(err.as_ptr()); }
+    unsafe { ll::SDL_SetError(err.as_ptr() as *const c_char); }
 }
 
 pub fn set_error_from_code(err: Error) {
diff --git a/src/sdl2/version.rs b/src/sdl2/version.rs
index 504c0187..1cf84f47 100644
--- a/src/sdl2/version.rs
+++ b/src/sdl2/version.rs
@@ -44,7 +44,7 @@ pub fn version() -> Version {
 pub fn revision() -> String {
     unsafe {
         let rev = ll::SDL_GetRevision();
-        String::from_utf8_lossy(CStr::from_ptr(rev).to_bytes()).to_string()
+        String::from_utf8_lossy(CStr::from_ptr(rev as *const i8).to_bytes()).to_string()
     }
 }
 
diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs
index 51d24bf7..31692c26 100644
--- a/src/sdl2/video.rs
+++ b/src/sdl2/video.rs
@@ -1,4 +1,4 @@
-use libc::{c_int, c_float, uint32_t};
+use libc::{c_int, c_float, uint32_t, c_char};
 use std::ffi::{CStr, CString};
 use std::mem;
 use std::ops::{Deref, DerefMut};
@@ -476,7 +476,7 @@ impl VideoSubsystem {
             let buf = ll::SDL_GetCurrentVideoDriver();
             assert!(!buf.is_null());
 
-            str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
+            str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
         }
     }
 
@@ -492,7 +492,7 @@ impl VideoSubsystem {
     pub fn display_name(&self, display_index: i32) -> String {
         unsafe {
             let display = ll::SDL_GetDisplayName(display_index as c_int);
-            String::from_utf8_lossy(CStr::from_ptr(display).to_bytes()).to_string()
+            String::from_utf8_lossy(CStr::from_ptr(display as *const i8).to_bytes()).to_string()
         }
     }
 
@@ -601,7 +601,7 @@ impl VideoSubsystem {
         unsafe {
             // TODO: use OsStr::to_cstring() once it's stable
             let path = CString::new(path.as_ref().to_str().unwrap()).unwrap();
-            if ll::SDL_GL_LoadLibrary(path.as_ptr()) == 0 {
+            if ll::SDL_GL_LoadLibrary(path.as_ptr() as *const c_char) == 0 {
                 Ok(())
             } else {
                 Err(get_error())
@@ -622,7 +622,7 @@ impl VideoSubsystem {
     /// This is useful for OpenGL wrappers such as [`gl-rs`](https://github.com/bjz/gl-rs).
     pub fn gl_get_proc_address(&self, procname: &str) -> *const () {
         match CString::new(procname) {
-            Ok(procname) => unsafe { ll::SDL_GL_GetProcAddress(procname.as_ptr()) as *const () },
+            Ok(procname) => unsafe { ll::SDL_GL_GetProcAddress(procname.as_ptr() as *const c_char) as *const () },
             // string contains a nul byte - it won't match anything.
             Err(_) => ptr::null()
         }
@@ -630,7 +630,7 @@ impl VideoSubsystem {
 
     pub fn gl_extension_supported(&self, extension: &str) -> bool {
         match CString::new(extension) {
-            Ok(extension) => unsafe { ll::SDL_GL_ExtensionSupported(extension.as_ptr()) != 0 },
+            Ok(extension) => unsafe { ll::SDL_GL_ExtensionSupported(extension.as_ptr() as *const c_char) != 0 },
             // string contains a nul byte - it won't match anything.
             Err(_) => false
         }
@@ -711,7 +711,7 @@ impl WindowBuilder {
                 let raw_height = self.height as c_int;
 
                 let raw = ll::SDL_CreateWindow(
-                        self.title.as_ptr(),
+                        self.title.as_ptr() as *const c_char,
                         unwrap_windowpos(self.x),
                         unwrap_windowpos(self.y),
                         raw_width,
@@ -938,7 +938,7 @@ impl WindowRef {
 
     pub fn set_title(&mut self, title: &str) {
         let title = CString::new(title).remove_nul();
-        unsafe { ll::SDL_SetWindowTitle(self.raw(), title.as_ptr()); }
+        unsafe { ll::SDL_SetWindowTitle(self.raw(), title.as_ptr() as *const c_char); }
     }
 
     pub fn title(&self) -> &str {
@@ -949,7 +949,7 @@ impl WindowRef {
             let buf = ll::SDL_GetWindowTitle(self.raw());
 
             // The window title must be encoded in UTF-8.
-            str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
+            str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
         }
     }
 
@@ -1177,7 +1177,7 @@ impl Iterator for DriverIterator {
                 assert!(!buf.is_null());
                 self.index += 1;
 
-                Some(str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap())
+                Some(str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap())
             }
         }
     }

From 5de5784499cf062fa8346a6067987e0de1676cd0 Mon Sep 17 00:00:00 2001
From: Tony Aldridge <zaragopha@hotmail.com>
Date: Fri, 27 Nov 2015 12:56:55 +0000
Subject: [PATCH 2/2] Updated to match 1.6.0 expected types

---
 src/sdl2/audio.rs             | 6 +++---
 src/sdl2/clipboard.rs         | 2 +-
 src/sdl2/controller.rs        | 4 ++--
 src/sdl2/event.rs             | 2 +-
 src/sdl2/filesystem.rs        | 4 ++--
 src/sdl2/hint.rs              | 2 +-
 src/sdl2/joystick.rs          | 4 ++--
 src/sdl2/keyboard/keycode.rs  | 2 +-
 src/sdl2/keyboard/scancode.rs | 2 +-
 src/sdl2/render.rs            | 2 +-
 src/sdl2/sdl.rs               | 2 +-
 src/sdl2/version.rs           | 2 +-
 src/sdl2/video.rs             | 8 ++++----
 13 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/sdl2/audio.rs b/src/sdl2/audio.rs
index 99e78ed3..05f76cca 100644
--- a/src/sdl2/audio.rs
+++ b/src/sdl2/audio.rs
@@ -80,7 +80,7 @@ impl AudioSubsystem {
             let buf = ll::SDL_GetCurrentAudioDriver();
             assert!(!buf.is_null());
 
-            str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
+            str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
         }
     }
 
@@ -100,7 +100,7 @@ impl AudioSubsystem {
             if dev_name.is_null() {
                 Err(get_error())
             } else {
-                Ok(String::from_utf8_lossy(CStr::from_ptr(dev_name as *const i8).to_bytes()).to_string())
+                Ok(String::from_utf8_lossy(CStr::from_ptr(dev_name).to_bytes()).to_string())
             }
         }
     }
@@ -221,7 +221,7 @@ impl Iterator for DriverIterator {
                 assert!(!buf.is_null());
                 self.index += 1;
 
-                Some(str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap())
+                Some(str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap())
             }
         }
     }
diff --git a/src/sdl2/clipboard.rs b/src/sdl2/clipboard.rs
index 3c330f29..40e516d9 100644
--- a/src/sdl2/clipboard.rs
+++ b/src/sdl2/clipboard.rs
@@ -49,7 +49,7 @@ impl ClipboardUtil {
             if buf.is_null() {
                 Err(get_error())
             } else {
-                Ok(String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).into_owned())
+                Ok(String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).into_owned())
             }
         }
     }
diff --git a/src/sdl2/controller.rs b/src/sdl2/controller.rs
index 58de8828..6a8a14fb 100644
--- a/src/sdl2/controller.rs
+++ b/src/sdl2/controller.rs
@@ -286,7 +286,7 @@ fn c_str_to_string(c_str: *const c_char) -> String {
     if c_str.is_null() {
         String::new()
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
 
         String::from_utf8_lossy(bytes).to_string()
     }
@@ -298,7 +298,7 @@ fn c_str_to_string_or_err(c_str: *const c_char) -> SdlResult<String> {
     if c_str.is_null() {
         Err(get_error())
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
 
         Ok(String::from_utf8_lossy(bytes).to_string())
     }
diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
index 13bdc7ec..458c2555 100644
--- a/src/sdl2/event.rs
+++ b/src/sdl2/event.rs
@@ -937,7 +937,7 @@ impl Event {
             EventType::DropFile => {
                 let ref event = *raw.drop();
 
-                let buf = CStr::from_ptr(event.file as *const i8).to_bytes();
+                let buf = CStr::from_ptr(event.file).to_bytes();
                 let text = String::from_utf8_lossy(buf).to_string();
                 ll::SDL_free(event.file as *mut c_void);
 
diff --git a/src/sdl2/filesystem.rs b/src/sdl2/filesystem.rs
index 78f586cb..fb885dee 100644
--- a/src/sdl2/filesystem.rs
+++ b/src/sdl2/filesystem.rs
@@ -9,7 +9,7 @@ use sys::filesystem as ll;
 pub fn base_path() -> SdlResult<String> {
     let result = unsafe {
         let buf = ll::SDL_GetBasePath();
-        String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).to_string()
+        String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).to_string()
     };
 
     if result.len() == 0 {
@@ -24,7 +24,7 @@ pub fn pref_path(org: &str, app: &str) -> SdlResult<String> {
         let org = try!(CString::new(org).unwrap_or_sdlresult());
         let app = try!(CString::new(app).unwrap_or_sdlresult());
         let buf = ll::SDL_GetPrefPath(org.as_ptr() as *const c_char, app.as_ptr() as *const c_char);
-        String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).to_string()
+        String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).to_string()
     };
 
     if result.len() == 0 {
diff --git a/src/sdl2/hint.rs b/src/sdl2/hint.rs
index 92c86ad1..e6953de9 100644
--- a/src/sdl2/hint.rs
+++ b/src/sdl2/hint.rs
@@ -28,7 +28,7 @@ pub fn get(name: &str) -> Option<String> {
         if res == ptr::null_mut() {
             None
         } else {
-            Some(str::from_utf8(CStr::from_ptr(res as *const i8).to_bytes()).unwrap().to_owned())
+            Some(str::from_utf8(CStr::from_ptr(res).to_bytes()).unwrap().to_owned())
         }
     }
 }
diff --git a/src/sdl2/joystick.rs b/src/sdl2/joystick.rs
index 06b8eb28..1379ca7e 100644
--- a/src/sdl2/joystick.rs
+++ b/src/sdl2/joystick.rs
@@ -381,7 +381,7 @@ fn c_str_to_string(c_str: *const c_char) -> String {
     if c_str.is_null() {
         String::new()
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
 
         String::from_utf8_lossy(bytes).to_string()
     }
@@ -393,7 +393,7 @@ fn c_str_to_string_or_err(c_str: *const c_char) -> SdlResult<String> {
     if c_str.is_null() {
         Err(get_error())
     } else {
-        let bytes = unsafe { CStr::from_ptr(c_str as *const i8).to_bytes() };
+        let bytes = unsafe { CStr::from_ptr(c_str).to_bytes() };
 
         Ok(String::from_utf8_lossy(bytes).to_string())
     }
diff --git a/src/sdl2/keyboard/keycode.rs b/src/sdl2/keyboard/keycode.rs
index eb7874c3..c3a254f8 100644
--- a/src/sdl2/keyboard/keycode.rs
+++ b/src/sdl2/keyboard/keycode.rs
@@ -549,7 +549,7 @@ impl Keycode {
         // Knowing this, we must always return a new string.
         unsafe {
             let buf = ::sys::keyboard::SDL_GetKeyName(self as i32);
-            String::from_utf8_lossy(CStr::from_ptr(buf as *const i8).to_bytes()).to_string()
+            String::from_utf8_lossy(CStr::from_ptr(buf).to_bytes()).to_string()
         }
     }
 }
diff --git a/src/sdl2/keyboard/scancode.rs b/src/sdl2/keyboard/scancode.rs
index 17199a51..7b2d8234 100644
--- a/src/sdl2/keyboard/scancode.rs
+++ b/src/sdl2/keyboard/scancode.rs
@@ -559,7 +559,7 @@ impl Scancode {
         // Knowing this, we can always return a string slice.
         unsafe {
             let buf = ::sys::keyboard::SDL_GetScancodeName(self as u32);
-            ::std::str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
+            ::std::str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
         }
     }
 }
diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs
index 2591563c..6b0cb6c7 100644
--- a/src/sdl2/render.rs
+++ b/src/sdl2/render.rs
@@ -115,7 +115,7 @@ impl RendererInfo {
         }).collect();
 
         // The driver name is always a static string, compiled into SDL2.
-        let name = str::from_utf8(CStr::from_ptr(info.name as *const i8).to_bytes()).unwrap();
+        let name = str::from_utf8(CStr::from_ptr(info.name).to_bytes()).unwrap();
 
         RendererInfo {
             name: name,
diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs
index 04cdf4ff..572f61b1 100644
--- a/src/sdl2/sdl.rs
+++ b/src/sdl2/sdl.rs
@@ -310,7 +310,7 @@ pub fn init() -> SdlResult<Sdl> { Sdl::new() }
 pub fn get_error() -> ErrorMessage {
     unsafe {
         let err = ll::SDL_GetError();
-        ErrorMessage(String::from_utf8_lossy(CStr::from_ptr(err as *const i8).to_bytes()).to_string())
+        ErrorMessage(String::from_utf8_lossy(CStr::from_ptr(err).to_bytes()).to_string())
     }
 }
 
diff --git a/src/sdl2/version.rs b/src/sdl2/version.rs
index 1cf84f47..504c0187 100644
--- a/src/sdl2/version.rs
+++ b/src/sdl2/version.rs
@@ -44,7 +44,7 @@ pub fn version() -> Version {
 pub fn revision() -> String {
     unsafe {
         let rev = ll::SDL_GetRevision();
-        String::from_utf8_lossy(CStr::from_ptr(rev as *const i8).to_bytes()).to_string()
+        String::from_utf8_lossy(CStr::from_ptr(rev).to_bytes()).to_string()
     }
 }
 
diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs
index 31692c26..5fe62a37 100644
--- a/src/sdl2/video.rs
+++ b/src/sdl2/video.rs
@@ -476,7 +476,7 @@ impl VideoSubsystem {
             let buf = ll::SDL_GetCurrentVideoDriver();
             assert!(!buf.is_null());
 
-            str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
+            str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
         }
     }
 
@@ -492,7 +492,7 @@ impl VideoSubsystem {
     pub fn display_name(&self, display_index: i32) -> String {
         unsafe {
             let display = ll::SDL_GetDisplayName(display_index as c_int);
-            String::from_utf8_lossy(CStr::from_ptr(display as *const i8).to_bytes()).to_string()
+            String::from_utf8_lossy(CStr::from_ptr(display).to_bytes()).to_string()
         }
     }
 
@@ -949,7 +949,7 @@ impl WindowRef {
             let buf = ll::SDL_GetWindowTitle(self.raw());
 
             // The window title must be encoded in UTF-8.
-            str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap()
+            str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
         }
     }
 
@@ -1177,7 +1177,7 @@ impl Iterator for DriverIterator {
                 assert!(!buf.is_null());
                 self.index += 1;
 
-                Some(str::from_utf8(CStr::from_ptr(buf as *const i8).to_bytes()).unwrap())
+                Some(str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap())
             }
         }
     }