aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Kaaman <trundmatu@gmail.com>2015-05-04 17:04:13 +0200
committerFelix Kaaman <trundmatu@gmail.com>2015-05-04 17:04:13 +0200
commit0a93e949fa39bb645aefbc8cd58e8f43d25dfcee (patch)
treefbbad3db57c554e18245f1224c054a0d5d7ba683
parent555dc648b73ae78c87b5a3da5fc2795f717f1e27 (diff)
parentf68116fd767b11f9441b68366fa179836e8ae1f9 (diff)
downloadglutin-0a93e949fa39bb645aefbc8cd58e8f43d25dfcee.tar.gz
glutin-0a93e949fa39bb645aefbc8cd58e8f43d25dfcee.zip
Merge pull request #427 from bvssvni/osxfix
Fix compiler errors on OSX
-rw-r--r--src/api/cocoa/headless.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/api/cocoa/headless.rs b/src/api/cocoa/headless.rs
index cc2a526..75cca8d 100644
--- a/src/api/cocoa/headless.rs
+++ b/src/api/cocoa/headless.rs
@@ -10,6 +10,7 @@ use core_foundation::string::CFString;
use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName};
use cocoa::base::{id, nil};
use cocoa::appkit::*;
+use PixelFormat;
mod gl {
include!(concat!(env!("OUT_DIR"), "/gl_bindings.rs"));
@@ -83,7 +84,7 @@ impl GlContext for HeadlessContext {
unimplemented!()
}
- fn get_proc_address(&self, _addr: &str) -> *const () {
+ fn get_proc_address(&self, _addr: &str) -> *const libc::c_void {
let symbol_name: CFString = _addr.parse().unwrap();
let framework_name: CFString = "com.apple.opengl".parse().unwrap();
let framework = unsafe {
@@ -92,7 +93,7 @@ impl GlContext for HeadlessContext {
let symbol = unsafe {
CFBundleGetFunctionPointerForName(framework, symbol_name.as_concrete_TypeRef())
};
- symbol as *const ()
+ symbol as *const libc::c_void
}
fn swap_buffers(&self) {