aboutsummaryrefslogtreecommitdiffstats
path: root/src/win32/mod.rs
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-02-21 18:11:02 +0100
committertomaka <pierre.krieger1708@gmail.com>2015-02-21 18:11:02 +0100
commit06eab6f6c0ad2d8085e2074c47967f770e49792a (patch)
tree862f0b3320c22d8cd5b7283203b71f10b66dab7d /src/win32/mod.rs
parent7ff76cddd981d64fbf0f821ba8a5f456fd0fcb29 (diff)
parent1055eed078f674ad4cc657e99a247310183d635e (diff)
downloadglutin-06eab6f6c0ad2d8085e2074c47967f770e49792a.tar.gz
glutin-06eab6f6c0ad2d8085e2074c47967f770e49792a.zip
Merge pull request #286 from mitchmindtree/master
Updated to latest nightly - RingBuf -> VecDeque, removed unnecessary as_slice_with_nul
Diffstat (limited to 'src/win32/mod.rs')
-rw-r--r--src/win32/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/win32/mod.rs b/src/win32/mod.rs
index cfb573a..4846d59 100644
--- a/src/win32/mod.rs
+++ b/src/win32/mod.rs
@@ -1,7 +1,7 @@
use std::sync::atomic::AtomicBool;
use std::ptr;
use std::ffi::CString;
-use std::collections::RingBuf;
+use std::collections::VecDeque;
use std::sync::mpsc::Receiver;
use libc;
use {CreationError, Event, MouseCursor};
@@ -192,7 +192,7 @@ impl Window {
/// See the docs in the crate root file.
pub fn get_proc_address(&self, addr: &str) -> *const () {
let addr = CString::from_slice(addr.as_bytes());
- let addr = addr.as_slice_with_nul().as_ptr();
+ let addr = addr.as_ptr();
unsafe {
let p = gl::wgl::GetProcAddress(addr) as *const ();