RingBuf -> VecDeque for other platforms, as_slice_with_nul -> as_bytes_with_nul
This commit is contained in:
parent
9bb41bf277
commit
0389c834e4
7 changed files with 18 additions and 18 deletions
|
|
@ -171,7 +171,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
|
|||
use libc;
|
||||
|
||||
let addr = CString::from_slice(addr.as_bytes());
|
||||
let addr = addr.as_slice_with_nul().as_ptr();
|
||||
let addr = addr.as_bytes_with_nul().as_ptr();
|
||||
|
||||
unsafe {
|
||||
gl::wgl::GetProcAddress(addr) as *const libc::c_void
|
||||
|
|
|
|||
|
|
@ -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_bytes_with_nul().as_ptr();
|
||||
|
||||
unsafe {
|
||||
let p = gl::wgl::GetProcAddress(addr) as *const ();
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use winapi;
|
||||
use user32;
|
||||
|
||||
use std::collections::RingBuf;
|
||||
use std::collections::VecDeque;
|
||||
|
||||
/// Win32 implementation of the main `MonitorID` object.
|
||||
pub struct MonitorID {
|
||||
|
|
@ -25,11 +25,11 @@ pub struct MonitorID {
|
|||
}
|
||||
|
||||
/// Win32 implementation of the main `get_available_monitors` function.
|
||||
pub fn get_available_monitors() -> RingBuf<MonitorID> {
|
||||
pub fn get_available_monitors() -> VecDeque<MonitorID> {
|
||||
use std::{iter, mem, ptr};
|
||||
|
||||
// return value
|
||||
let mut result = RingBuf::new();
|
||||
let mut result = VecDeque::new();
|
||||
|
||||
// enumerating the devices is done by querying device 0, then device 1, then device 2, etc.
|
||||
// until the query function returns null
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue