aboutsummaryrefslogtreecommitdiffstats
path: root/src/win32/init.rs
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2015-01-08 09:28:22 +0100
committerPierre Krieger <pierre.krieger1708@gmail.com>2015-01-08 09:28:22 +0100
commitdbdb43f077f4fa016e9f3f65345c4a947eceaa77 (patch)
tree0f29c680b0e088e74d51be759ad566f15022a80c /src/win32/init.rs
parent25b261975c6756a3e0f9ee36107f185103b35292 (diff)
downloadglutin-dbdb43f077f4fa016e9f3f65345c4a947eceaa77.tar.gz
glutin-dbdb43f077f4fa016e9f3f65345c4a947eceaa77.zip
Update for Rustc
Diffstat (limited to 'src/win32/init.rs')
-rw-r--r--src/win32/init.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/win32/init.rs b/src/win32/init.rs
index d3341fe..77965ea 100644
--- a/src/win32/init.rs
+++ b/src/win32/init.rs
@@ -6,6 +6,7 @@ use {CreationError, Event};
use CreationError::OsError;
use std::cell::RefCell;
+use std::ffi::CString;
use std::rc::Rc;
use std::sync::mpsc::{Sender, Receiver, channel};
@@ -224,11 +225,12 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
// loading the extra WGL functions
let extra_functions = gl::wgl_extra::Wgl::load_with(|addr| {
use libc;
- use std::c_str::ToCStr;
+
+ let addr = CString::from_slice(addr.as_bytes());
+ let addr = addr.as_slice_with_nul().as_ptr();
unsafe {
- let addr = addr.to_c_str();
- gl::wgl::GetProcAddress(addr.as_ptr()) as *const libc::c_void
+ gl::wgl::GetProcAddress(addr) as *const libc::c_void
}
});