diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-11-09 08:28:35 +0100 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-11-09 08:28:35 +0100 |
| commit | 439d25168e0145bb563c2675ce490c521448f4ba (patch) | |
| tree | 466c4fd12bba70b78b86d458583cf1349f64e550 /src/api | |
| parent | 0386d093d1acca9c6010e6360bef781726efde5c (diff) | |
| parent | 947effd3a0c250f2aee72bbfdbfa26b13ae09067 (diff) | |
| download | glutin-439d25168e0145bb563c2675ce490c521448f4ba.tar.gz glutin-439d25168e0145bb563c2675ce490c521448f4ba.zip | |
Merge pull request #655 from mitchmindtree/master
Lock objc to 0.1.7. Fix remaining libc pointer errors with casts. Fix warnings in cursor example.
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/cocoa/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index 2b4b5e5..c6d53d4 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -310,7 +310,7 @@ impl Window { let obj = context.CGLContextObj(); let mut opacity = 0; - CGLSetParameter(obj, kCGLCPSurfaceOpacity, &mut opacity); + CGLSetParameter(obj as *mut _, kCGLCPSurfaceOpacity, &mut opacity); } app.activateIgnoringOtherApps_(YES); @@ -558,7 +558,7 @@ impl Window { let value = if opengl.vsync { 1 } else { 0 }; cxt.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval); - CGLEnable(cxt.CGLContextObj(), kCGLCECrashOnRemovedFunctions); + CGLEnable(cxt.CGLContextObj() as *mut _, kCGLCECrashOnRemovedFunctions); Ok((cxt, pf)) } else { |