Merge branch 'libc_0_2' of http://github.com/mitchmindtree/glutin int…

…o rem-gl-common

Conflicts:
	src/headless.rs

Cargo.toml

@@ -13,11 +13,11 @@ build = "build.rs"
 [dependencies]
 gl_common = "0.1.0"
 lazy_static = "0.1.10"
-libc = "0.1"
+libc = "0.2"
 shared_library = "0.1.0"
 
 [build-dependencies]
-gl_generator = "0.1.0"
+gl_generator = "0.2.0"
 khronos_api = "0.0.8"
 
 [dev-dependencies]
@@ -27,23 +27,23 @@ clock_ticks = "0.1.0"
 version = "0.1"
 
 [target.i386-apple-ios.dependencies]
-objc = "0.1"
+objc = "0.1.8"
 
 [target.x86_64-apple-ios.dependencies]
-objc = "0.1"
+objc = "0.1.8"
 
 [target.aarch64-apple-ios.dependencies]
-objc = "0.1"
+objc = "0.1.8"
 
 [target.armv7s-apple-ios.dependencies]
-objc = "0.1"
+objc = "0.1.8"
 
 [target.armv7-apple-ios.dependencies]
-objc = "0.1"
+objc = "0.1.8"
 
 [target.x86_64-apple-darwin.dependencies]
-objc = "0.1"
-cgl = "0"
+objc = "0.1.8"
+cgl = "0.1"
 cocoa = "0.1.4"
 core-foundation = "0"
 core-graphics = "0"
@@ -53,31 +53,31 @@ winapi = "0.2"
 shell32-sys = "0.1"
 gdi32-sys = "0.1"
 user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
+kernel32-sys = "0.2"
 dwmapi-sys = "0.1"
 
 [target.i686-pc-windows-msvc.dependencies]
 winapi = "0.2"
 shell32-sys = "0.1"
 gdi32-sys = "0.1"
 user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
+kernel32-sys = "0.2"
 dwmapi-sys = "0.1"
 
 [target.x86_64-pc-windows-gnu.dependencies]
 winapi = "0.2"
 shell32-sys = "0.1"
 gdi32-sys = "0.1"
 user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
+kernel32-sys = "0.2"
 dwmapi-sys = "0.1"
 
 [target.x86_64-pc-windows-msvc.dependencies]
 winapi = "0.2"
 shell32-sys = "0.1"
 gdi32-sys = "0.1"
 user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
+kernel32-sys = "0.2"
 dwmapi-sys = "0.1"
 
 [target.i686-unknown-linux-gnu.dependencies]

examples/cursor.rs

@@ -14,7 +14,7 @@ android_start!(main);
 fn main() {    
     let window = glutin::WindowBuilder::new().build().unwrap();
     window.set_title("A fantastic window!");   
-    unsafe { window.make_current() };
+    unsafe { window.make_current().unwrap() };
 
     let context = support::load(&window);
     let cursors = [MouseCursor::Default, MouseCursor::Crosshair, MouseCursor::Hand, MouseCursor::Arrow, MouseCursor::Move, MouseCursor::Text, MouseCursor::Wait, MouseCursor::Help, MouseCursor::Progress, MouseCursor::NotAllowed, MouseCursor::ContextMenu, MouseCursor::NoneCursor, MouseCursor::Cell, MouseCursor::VerticalText, MouseCursor::Alias, MouseCursor::Copy, MouseCursor::NoDrop, MouseCursor::Grab, MouseCursor::Grabbing, MouseCursor::AllScroll, MouseCursor::ZoomIn, MouseCursor::ZoomOut, MouseCursor::EResize, MouseCursor::NResize, MouseCursor::NeResize, MouseCursor::NwResize, MouseCursor::SResize, MouseCursor::SeResize, MouseCursor::SwResize, MouseCursor::WResize, MouseCursor::EwResize, MouseCursor::NsResize, MouseCursor::NeswResize, MouseCursor::NwseResize, MouseCursor::ColResize, MouseCursor::RowResize];
@@ -36,6 +36,6 @@ fn main() {
         }
 
         context.draw_frame((0.0, 1.0, 0.0, 1.0));
-        window.swap_buffers();
+        window.swap_buffers().unwrap();
     }
 }

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 {

src/lib.rs

@@ -29,7 +29,6 @@ extern crate lazy_static;
 #[macro_use]
 extern crate shared_library;
 
-extern crate gl_common;
 extern crate libc;
 
 #[cfg(target_os = "windows")]