diff options
Diffstat (limited to 'src/platform')
-rw-r--r-- | src/platform/emscripten/mod.rs | 2 | ||||
-rw-r--r-- | src/platform/ios/mod.rs | 3 | ||||
-rw-r--r-- | src/platform/linux/api_dispatch.rs | 2 | ||||
-rw-r--r-- | src/platform/linux/mod.rs | 3 | ||||
-rw-r--r-- | src/platform/windows/mod.rs | 4 |
5 files changed, 5 insertions, 9 deletions
diff --git a/src/platform/emscripten/mod.rs b/src/platform/emscripten/mod.rs index 0d059d7..270cdaf 100644 --- a/src/platform/emscripten/mod.rs +++ b/src/platform/emscripten/mod.rs @@ -28,7 +28,7 @@ impl GlContext for HeadlessContext { } #[inline] - fn get_proc_address(&self, addr: &str) -> *const libc::c_void { + fn get_proc_address(&self, addr: &str) -> *const () { self.0.get_proc_address(addr) } diff --git a/src/platform/ios/mod.rs b/src/platform/ios/mod.rs index 95fa7e1..aeaebc3 100644 --- a/src/platform/ios/mod.rs +++ b/src/platform/ios/mod.rs @@ -1,5 +1,4 @@ #![cfg(target_os = "ios")] -use libc::c_void; use GlAttributes; use CreationError; @@ -33,7 +32,7 @@ impl HeadlessContext { } /// See the docs in the crate root file. - pub fn get_proc_address(&self, _addr: &str) -> *const c_void { + pub fn get_proc_address(&self, _addr: &str) -> *const () { unimplemented!() } diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs index aa1ba58..a3c3bf9 100644 --- a/src/platform/linux/api_dispatch.rs +++ b/src/platform/linux/api_dispatch.rs @@ -359,7 +359,7 @@ impl GlContext for Window { } #[inline] - fn get_proc_address(&self, addr: &str) -> *const libc::c_void { + fn get_proc_address(&self, addr: &str) -> *const () { match self { &Window::X(ref w) => w.get_proc_address(addr), &Window::Wayland(ref w) => w.get_proc_address(addr) diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs index c984926..d010a89 100644 --- a/src/platform/linux/mod.rs +++ b/src/platform/linux/mod.rs @@ -7,7 +7,6 @@ use GlAttributes; use GlContext; use PixelFormat; use PixelFormatRequirements; -use libc; use api::osmesa::{self, OsMesaContext}; @@ -45,7 +44,7 @@ impl GlContext for HeadlessContext { } #[inline] - fn get_proc_address(&self, addr: &str) -> *const libc::c_void { + fn get_proc_address(&self, addr: &str) -> *const () { self.0.get_proc_address(addr) } diff --git a/src/platform/windows/mod.rs b/src/platform/windows/mod.rs index a280316..246ca51 100644 --- a/src/platform/windows/mod.rs +++ b/src/platform/windows/mod.rs @@ -4,8 +4,6 @@ pub use api::win32; pub use api::win32::{MonitorId, get_available_monitors, get_primary_monitor}; pub use api::win32::{WindowProxy, PollEventsIterator, WaitEventsIterator}; -use libc; - use Api; use ContextError; use CreationError; @@ -134,7 +132,7 @@ impl GlContext for HeadlessContext { } #[inline] - fn get_proc_address(&self, addr: &str) -> *const libc::c_void { + fn get_proc_address(&self, addr: &str) -> *const () { match self { &HeadlessContext::HiddenWindow(ref ctxt) => ctxt.get_proc_address(addr), &HeadlessContext::EglPbuffer(ref ctxt) => ctxt.get_proc_address(addr), |