Auto merge of #215 - Daggerbot:pr, r=larsbergstrom

Pass XFree param as '*mut _' to avoid c_void conflicts.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/rust-layers/215)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -9,7 +9,7 @@ default = []
 plugins = ["euclid/plugins", "azure/plugins", "skia/euclid/plugins", "io-surface/euclid/plugins"]
 
 [dependencies]
-libc = "*"
+libc = "0.2"
 rustc-serialize = "*"
 log = "*"
 gleam = "0.1"
@@ -41,19 +41,19 @@ git = "https://github.com/servo/rust-glx"
 git = "https://github.com/servo/rust-glx"
 
 [target.i686-unknown-linux-gnu.dependencies.x11]
-version = "2.0.0"
+version = "2.3.0"
 features = ["xlib"]
 
 [target.x86_64-unknown-linux-gnu.dependencies.x11]
-version = "2.0.0"
+version = "2.3.0"
 features = ["xlib"]
 
 [target.arm-unknown-linux-gnueabihf.dependencies.x11]
-version = "2.0.0"
+version = "2.3.0"
 features = ["xlib"]
 
 [target.aarch64-unknown-linux-gnu.dependencies.x11]
-version = "2.0.0"
+version = "2.3.0"
 features = ["xlib"]
 
 [target.arm-linux-androideabi.dependencies.egl]

src/platform/linux/surface.rs

@@ -101,7 +101,7 @@ impl NativeDisplay {
                 let config = *configs.offset(0);
                 let visual = glx::GetVisualFromFBConfig(mem::transmute(display), config);
 
-                xlib::XFree(configs as *mut c_void);
+                xlib::XFree(configs as *mut _);
                 return (mem::transmute(visual), Some(config));
             }
 
@@ -113,13 +113,13 @@ impl NativeDisplay {
                 let visual: *mut xlib::XVisualInfo =
                     mem::transmute(glx::GetVisualFromFBConfig(mem::transmute(display), config));
                 if (*visual).depth == 32 {
-                    xlib::XFree(configs as *mut c_void);
+                    xlib::XFree(configs as *mut _);
                     return (visual, Some(config));
                 }
-                xlib::XFree(visual as *mut c_void);
+                xlib::XFree(visual as *mut _);
             }
 
-            xlib::XFree(configs as *mut c_void);
+            xlib::XFree(configs as *mut _);
             panic!("Could not find 32-bit visual.");
         }
     }