diff options
| author | Tomaka17 <pierre.krieger1708@gmail.com> | 2014-09-23 08:01:18 +0200 |
|---|---|---|
| committer | Tomaka17 <pierre.krieger1708@gmail.com> | 2014-09-23 08:01:18 +0200 |
| commit | ea957ce1d77756eec0025f5f8d582e7daf350343 (patch) | |
| tree | 17dbad3afbcce474d2382e10ef4d3a73738a8cf7 /src/win32 | |
| parent | 07734275139d2e2abd0b800f9fd53871ffa88ceb (diff) | |
| download | glutin-ea957ce1d77756eec0025f5f8d582e7daf350343.tar.gz glutin-ea957ce1d77756eec0025f5f8d582e7daf350343.zip | |
Fix compilation warnings
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/init.rs | 6 | ||||
| -rw-r--r-- | src/win32/monitor.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/win32/init.rs b/src/win32/init.rs index 0da916b..7ad4dca 100644 --- a/src/win32/init.rs +++ b/src/win32/init.rs @@ -87,7 +87,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> { screen_settings.dmFields = ffi::DM_BITSPERPEL | ffi::DM_PELSWIDTH | ffi::DM_PELSHEIGHT; let result = unsafe { ffi::ChangeDisplaySettingsExW(monitor.get_system_name().as_ptr(), - &mut screen_settings, ptr::null(), ffi::CDS_FULLSCREEN, ptr::mut_null()) }; + &mut screen_settings, ptr::null(), ffi::CDS_FULLSCREEN, ptr::null_mut()) }; if result != ffi::DISP_CHANGE_SUCCESSFUL { tx.send(Err(format!("ChangeDisplaySettings failed: {}", result))); @@ -117,7 +117,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> { ffi::CW_USEDEFAULT, ffi::CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, ptr::null(), ptr::null(), ffi::GetModuleHandleW(ptr::null()), - ptr::mut_null()); + ptr::null_mut()); if handle.is_null() { use std::os; @@ -240,7 +240,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> { if builder.monitor.is_some() { 0 } else { ffi::CW_USEDEFAULT }, width.unwrap_or(ffi::CW_USEDEFAULT), height.unwrap_or(ffi::CW_USEDEFAULT), ptr::null(), ptr::null(), ffi::GetModuleHandleW(ptr::null()), - ptr::mut_null()); + ptr::null_mut()); if handle.is_null() { use std::os; diff --git a/src/win32/monitor.rs b/src/win32/monitor.rs index 435dab4..a45c8fb 100644 --- a/src/win32/monitor.rs +++ b/src/win32/monitor.rs @@ -95,7 +95,7 @@ pub fn get_primary_monitor() -> MonitorID { // we simply get all available monitors and return the one with the `PRIMARY_DEVICE` flag // TODO: it is possible to query the win32 API for the primary monitor, this should be done // instead - for monitor in get_available_monitors().move_iter() { + for monitor in get_available_monitors().into_iter() { if (monitor.flags & ffi::DISPLAY_DEVICE_PRIMARY_DEVICE) != 0 { return monitor } |