migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 21:00:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove public exports of gl_common and libc

Browse Source
This commit is contained in:
Pierre Krieger
2015-11-04 11:27:50 +01:00
parent 439d25168e
commit 37262fb228
22 changed files with 29 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/emscripten/mod.rs
View File

@@ -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)
}

3
src/platform/ios/mod.rs
View File

@@ -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!()
}

2
src/platform/linux/api_dispatch.rs
View File

@@ -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)

3
src/platform/linux/mod.rs
View File

@@ -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)
}

4
src/platform/windows/mod.rs
View File

@@ -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),