diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-11-09 10:10:22 +0100 | 
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-11-09 10:10:22 +0100 | 
| commit | bfc46c56703eab9404651ea9dd4a195acbe8c784 (patch) | |
| tree | bf8f195f8b38c7f6d78d917fe95ed768bcaaefc5 /src/window.rs | |
| parent | 439d25168e0145bb563c2675ce490c521448f4ba (diff) | |
| parent | b02265fa1103c526c365d7768e3c8ae3633cf4cf (diff) | |
| download | glutin-bfc46c56703eab9404651ea9dd4a195acbe8c784.tar.gz glutin-bfc46c56703eab9404651ea9dd4a195acbe8c784.zip | |
Merge pull request #652 from tomaka/rem-gl-common
[Breaking change] Remove public exports of gl_common and libc
Diffstat (limited to 'src/window.rs')
| -rw-r--r-- | src/window.rs | 15 | 
1 files changed, 3 insertions, 12 deletions
| diff --git a/src/window.rs b/src/window.rs index 7a87806..86322bd 100644 --- a/src/window.rs +++ b/src/window.rs @@ -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)      } | 
