aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-05-09 07:04:01 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-05-09 07:04:01 +0200
commit9ba9bfc369a211d96688a785a0bfe9d572d8638b (patch)
tree3088cf5a56d0e96a47301a17ac376552c338a94a
parent3f20bf345e4464ab83e7b8d1737b0173ec7b6d4f (diff)
parentc973a1f83e2f9cea017e9dd48c4acaeb23fe5eb7 (diff)
downloadglutin-9ba9bfc369a211d96688a785a0bfe9d572d8638b.tar.gz
glutin-9ba9bfc369a211d96688a785a0bfe9d572d8638b.zip
Merge pull request #439 from Esption/master
Fixed build warnings on Linux
-rw-r--r--src/api/caca/ffi.rs4
-rw-r--r--src/api/caca/mod.rs1
-rw-r--r--src/api/dlopen.rs1
-rw-r--r--src/api/egl/ffi.rs2
-rw-r--r--src/api/egl/mod.rs7
-rw-r--r--src/api/osmesa/mod.rs1
-rw-r--r--src/api/wayland/mod.rs5
-rw-r--r--src/api/x11/mod.rs2
-rw-r--r--src/headless.rs13
-rw-r--r--src/lib.rs1
10 files changed, 21 insertions, 16 deletions
diff --git a/src/api/caca/ffi.rs b/src/api/caca/ffi.rs
index e0921ae..4a7b813 100644
--- a/src/api/caca/ffi.rs
+++ b/src/api/caca/ffi.rs
@@ -1,6 +1,6 @@
+#![allow(non_camel_case_types)]
+
use libc;
-use std::ffi::CStr;
-use std::mem;
pub type caca_display_t = libc::c_void;
pub type caca_canvas_t = libc::c_void;
diff --git a/src/api/caca/mod.rs b/src/api/caca/mod.rs
index 1e3840c..06a6931 100644
--- a/src/api/caca/mod.rs
+++ b/src/api/caca/mod.rs
@@ -1,4 +1,5 @@
#![cfg(any(target_os = "linux", target_os = "freebsd"))]
+#![allow(unused_variables, dead_code)]
use libc;
use api::osmesa::{OsMesaContext, OsMesaCreationError};
diff --git a/src/api/dlopen.rs b/src/api/dlopen.rs
index 63f690a..945dfb0 100644
--- a/src/api/dlopen.rs
+++ b/src/api/dlopen.rs
@@ -1,4 +1,5 @@
#![cfg(target_os = "linux")]
+#![allow(dead_code)]
use libc;
diff --git a/src/api/egl/ffi.rs b/src/api/egl/ffi.rs
index 5fa6384..6a81ada 100644
--- a/src/api/egl/ffi.rs
+++ b/src/api/egl/ffi.rs
@@ -1,3 +1,5 @@
+#![allow(non_camel_case_types)]
+
use libc;
#[cfg(target_os = "windows")]
diff --git a/src/api/egl/mod.rs b/src/api/egl/mod.rs
index b2fe2c6..8f9ebcf 100644
--- a/src/api/egl/mod.rs
+++ b/src/api/egl/mod.rs
@@ -1,4 +1,5 @@
#![cfg(any(target_os = "linux", target_os = "android"))]
+#![allow(unused_variables)]
use BuilderAttribs;
use CreationError;
@@ -161,9 +162,7 @@ impl Context {
impl GlContext for Context {
unsafe fn make_current(&self) {
- let ret = unsafe {
- self.egl.MakeCurrent(self.display, self.surface, self.surface, self.context)
- };
+ let ret = self.egl.MakeCurrent(self.display, self.surface, self.surface, self.context);
if ret == 0 {
panic!("eglMakeCurrent failed");
@@ -206,8 +205,6 @@ unsafe impl Sync for Context {}
impl Drop for Context {
fn drop(&mut self) {
- use std::ptr;
-
unsafe {
// we don't call MakeCurrent(0, 0) because we are not sure that the context
// is still the current one
diff --git a/src/api/osmesa/mod.rs b/src/api/osmesa/mod.rs
index 22df72a..26808f7 100644
--- a/src/api/osmesa/mod.rs
+++ b/src/api/osmesa/mod.rs
@@ -60,6 +60,7 @@ impl OsMesaContext {
(self.width, self.height)
}
+ #[allow(dead_code)]
// TODO: can we remove this without causing havoc?
pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
}
diff --git a/src/api/wayland/mod.rs b/src/api/wayland/mod.rs
index d2ca990..31e9243 100644
--- a/src/api/wayland/mod.rs
+++ b/src/api/wayland/mod.rs
@@ -1,4 +1,5 @@
#![cfg(target_os = "linux")]
+#![allow(unused_variables, dead_code)]
use self::wayland::egl::{EGLSurface, is_egl_available};
use self::wayland::core::{Display, Registry, Compositor, Shell, ShellSurface,
@@ -258,7 +259,7 @@ impl Window {
wayland_context.register_surface(shell_surface.get_wsurface().get_id(), events.clone());
- wayland_context.display.flush();
+ wayland_context.display.flush().unwrap();
Ok(Window {
shell_surface: shell_surface,
@@ -375,4 +376,4 @@ impl Drop for Window {
ctxt.deregister_surface(self.shell_surface.get_wsurface().get_id())
}
}
-} \ No newline at end of file
+}
diff --git a/src/api/x11/mod.rs b/src/api/x11/mod.rs
index 4edfbbd..4efa11c 100644
--- a/src/api/x11/mod.rs
+++ b/src/api/x11/mod.rs
@@ -414,7 +414,7 @@ impl Window {
};
// getting the visual infos
- let mut visual_infos: ffi::glx::types::XVisualInfo = unsafe {
+ let visual_infos: ffi::glx::types::XVisualInfo = unsafe {
let vi = glx.GetVisualFromFBConfig(display as *mut _, fb_config);
if vi.is_null() {
return Err(OsError(format!("glx::ChooseVisual failed")));
diff --git a/src/headless.rs b/src/headless.rs
index 566cbee..997d87a 100644
--- a/src/headless.rs
+++ b/src/headless.rs
@@ -106,26 +106,27 @@ impl gl_common::GlFunctionsSource for HeadlessContext {
impl GlContext for HeadlessContext {
unsafe fn make_current(&self) {
- self.make_current()
+ self.context.make_current()
}
fn is_current(&self) -> bool {
- self.is_current()
+ self.context.is_current()
}
fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
- self.get_proc_address(addr)
+ self.context.get_proc_address(addr)
}
fn swap_buffers(&self) {
- self.swap_buffers()
+ self.context.swap_buffers()
}
fn get_api(&self) -> Api {
- self.get_api()
+ self.context.get_api()
}
fn get_pixel_format(&self) -> PixelFormat {
- self.get_pixel_format()
+ self.context.get_pixel_format()
}
}
+
diff --git a/src/lib.rs b/src/lib.rs
index d1d52fc..09d48d3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -323,6 +323,7 @@ impl BuilderAttribs<'static> {
}
impl<'a> BuilderAttribs<'a> {
+ #[allow(dead_code)]
fn extract_non_static(mut self) -> (BuilderAttribs<'static>, Option<&'a platform::Window>) {
let sharing = self.sharing.take();