diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-04-03 07:52:12 +0200 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-04-03 07:52:12 +0200 |
| commit | 93f4581c08b1b25852527223a6f3608870532a87 (patch) | |
| tree | 5323fa00d2ea700dd64dfd2dff36ac169ccac163 /examples/support | |
| parent | 6c990ae48866e6110600aadcb3a0d8850deab42b (diff) | |
| parent | d33c138164d069f025439f97920771f1f8c7775e (diff) | |
| download | glutin-93f4581c08b1b25852527223a6f3608870532a87.tar.gz glutin-93f4581c08b1b25852527223a6f3608870532a87.zip | |
Merge pull request #348 from tomaka/rustup
Rustup
Diffstat (limited to 'examples/support')
| -rw-r--r-- | examples/support/mod.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/support/mod.rs b/examples/support/mod.rs index 94ef1a7..329bd4b 100644 --- a/examples/support/mod.rs +++ b/examples/support/mod.rs @@ -1,5 +1,6 @@ #![cfg(feature = "window")] +use std::ffi::CStr; use glutin; #[cfg(not(target_os = "android"))] @@ -21,8 +22,8 @@ pub fn load(window: &glutin::Window) -> Context { let gl = gl::Gl::load(window); let version = unsafe { - use std::ffi; - String::from_utf8(ffi::c_str_to_bytes(&(gl.GetString(gl::VERSION) as *const i8)).to_vec()).unwrap() + let data = CStr::from_ptr(gl.GetString(gl::VERSION) as *const i8).to_bytes().to_vec(); + String::from_utf8(data).unwrap() }; println!("OpenGL version {}", version); |