Fix the libcpocalypse issues preventing Servo's Glutin fork from building standalone.

Cargo.toml

@@ -11,14 +11,13 @@ documentation = "https://tomaka.github.io/glutin/"
 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"
-khronos_api = "0.0.8"
+gl_generator = "0.4"
+khronos_api = "1.0"
 
 [dev-dependencies]
 clock_ticks = "0.0.5"
@@ -44,7 +43,7 @@ objc = "0.1"
 [target.x86_64-apple-darwin.dependencies]
 objc = "0.1"
 cgl = "0"
-cocoa = "0.1.4"
+cocoa = "0.2.5"
 core-foundation = "0"
 core-graphics = "0"
 

src/api/cocoa/headless.rs

@@ -5,6 +5,7 @@ use GlAttributes;
 use GlContext;
 use PixelFormatRequirements;
 use libc;
+use std::os;
 use std::ptr;
 
 use core_foundation::base::TCFType;
@@ -57,7 +58,7 @@ impl HeadlessContext {
         };
 
         // Load the function pointers as we need them to create the FBO
-        gl::load_with(|s| headless.get_proc_address(s) as *const libc::c_void);
+        gl::load_with(|s| headless.get_proc_address(s) as *const os::raw::c_void);
 
         Ok(headless)
     }

src/headless.rs

@@ -8,7 +8,6 @@ use PixelFormat;
 use PixelFormatRequirements;
 use Robustness;
 
-use gl_common;
 use libc;
 
 use platform;
@@ -120,13 +119,6 @@ impl HeadlessContext {
     }
 }
 
-impl gl_common::GlFunctionsSource for HeadlessContext {
-    #[inline]
-    fn get_proc_addr(&self, addr: &str) -> *const libc::c_void {
-        self.get_proc_address(addr)
-    }
-}
-
 impl GlContext for HeadlessContext {
     #[inline]
     unsafe fn make_current(&self) -> Result<(), ContextError> {

src/window.rs

@@ -18,7 +18,6 @@ use Window;
 use WindowAttributes;
 use native_monitor::NativeMonitorId;
 
-use gl_common;
 use libc;
 
 use platform;
@@ -492,13 +491,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> {