Merge pull request #863 from petevine/patch-1

kvark · kvark · commit 728694d52751 · 2016-02-08T09:34:41.000-05:00
Additional ARM fix
diff --git a/src/backend/gl/src/info.rs b/src/backend/gl/src/info.rs
@@ -136,7 +136,7 @@ fn get_usize(gl: &gl::Gl, name: gl::types::GLenum) -> usize {
 }
 
 unsafe fn c_str_as_static_str(c_str: *const i8) -> &'static str {
-    mem::transmute(str::from_utf8(ffi::CStr::from_ptr(c_str).to_bytes()).unwrap())
+    mem::transmute(str::from_utf8(ffi::CStr::from_ptr(c_str as *const _).to_bytes()).unwrap())
 }
 
 /// A unique platform identifier that does not change between releases

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ fn get_usize(gl: &gl::Gl, name: gl::types::GLenum) -> usize {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`unsafe fn c_str_as_static_str(c_str: *const i8) -> &'static str {`
`139`		`- mem::transmute(str::from_utf8(ffi::CStr::from_ptr(c_str).to_bytes()).unwrap())`
	`139`	`+ mem::transmute(str::from_utf8(ffi::CStr::from_ptr(c_str as *const _).to_bytes()).unwrap())`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`/// A unique platform identifier that does not change between releases`