migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-30 13:20:06 -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

15
src/window.rs
View File

@@ -18,9 +18,7 @@ use Window;
use WindowAttributes;
use native_monitor::NativeMonitorId;
use gl_common;
use libc;
use platform;
/// Object that allows you to build windows.
@@ -397,8 +395,8 @@ impl Window {
///
/// Contrary to `wglGetProcAddress`, all available OpenGL functions return an address.
#[inline]
pub fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
self.window.get_proc_address(addr) as *const libc::c_void
pub fn get_proc_address(&self, addr: &str) -> *const () {
self.window.get_proc_address(addr)
}
/// Swaps the buffers in case of double or triple buffering.
@@ -492,13 +490,6 @@ impl Window {
}
}
impl gl_common::GlFunctionsSource for Window {
#[inline]
fn get_proc_addr(&self, addr: &str) -> *const libc::c_void {
self.get_proc_address(addr)
}
}
impl GlContext for Window {
#[inline]
unsafe fn make_current(&self) -> Result<(), ContextError> {
@@ -511,7 +502,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 () {
self.get_proc_address(addr)
}