aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2014-10-24 13:10:41 +0200
committertomaka <pierre.krieger1708@gmail.com>2014-10-24 13:10:41 +0200
commit5c31daf7e2e93e58abc8b3c03459c88098c280fa (patch)
tree453a82ef07b829adf8fe885d921ef68093323a5c
parent2c9eaf86512a77da5f20acc87d9c5cd949078a85 (diff)
parent0eda82c28fc776923bd5139ca03be503195b0010 (diff)
downloadglutin-5c31daf7e2e93e58abc8b3c03459c88098c280fa.tar.gz
glutin-5c31daf7e2e93e58abc8b3c03459c88098c280fa.zip
Merge pull request #68 from tomaka/fix-native-win
Add `platform_display` impls for win32 and android
-rw-r--r--src/android/mod.rs3
-rw-r--r--src/osx/mod.rs1
-rw-r--r--src/win32/mod.rs3
3 files changed, 5 insertions, 2 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs
index ef2e5e0..4149cc9 100644
--- a/src/android/mod.rs
+++ b/src/android/mod.rs
@@ -1,6 +1,7 @@
extern crate android_glue;
extern crate native;
+use libc;
use {Event, WindowBuilder};
pub struct Window {
@@ -188,7 +189,7 @@ impl Window {
}
pub fn platform_display(&self) -> *mut libc::c_void {
- unimplemented!()
+ self.surface as *mut libc::c_void
}
}
diff --git a/src/osx/mod.rs b/src/osx/mod.rs
index 2ad1ba3..287dcb4 100644
--- a/src/osx/mod.rs
+++ b/src/osx/mod.rs
@@ -1,4 +1,5 @@
use Event;
+use libc;
use std::sync::atomic::AtomicBool;
#[cfg(feature = "window")]
diff --git a/src/win32/mod.rs b/src/win32/mod.rs
index 5ce9677..13349f7 100644
--- a/src/win32/mod.rs
+++ b/src/win32/mod.rs
@@ -1,5 +1,6 @@
use std::sync::atomic::AtomicBool;
use std::ptr;
+use libc;
use Event;
#[cfg(feature = "window")]
@@ -235,7 +236,7 @@ impl Window {
}
pub fn platform_display(&self) -> *mut libc::c_void {
- unimplemented!()
+ self.window as *mut libc::c_void
}
}