aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2014-10-26 15:40:31 +0100
committertomaka <pierre.krieger1708@gmail.com>2014-10-26 15:40:31 +0100
commit0d37f01b5adc274b9d7f72f2ad3c942d640438ab (patch)
tree960acd8ffd8294e650cd658f93039e16c4fc78d4
parent5c31daf7e2e93e58abc8b3c03459c88098c280fa (diff)
parentfa99f0e70133bb58eb92b3f4a568abb41832bb72 (diff)
downloadglutin-0d37f01b5adc274b9d7f72f2ad3c942d640438ab.tar.gz
glutin-0d37f01b5adc274b9d7f72f2ad3c942d640438ab.zip
Merge pull request #69 from tomaka/revert-68-fix-native-win
[WIP] Fix platform_display behavior on android and win32
-rw-r--r--src/android/mod.rs2
-rw-r--r--src/win32/mod.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs
index 4149cc9..db3dd19 100644
--- a/src/android/mod.rs
+++ b/src/android/mod.rs
@@ -189,7 +189,7 @@ impl Window {
}
pub fn platform_display(&self) -> *mut libc::c_void {
- self.surface as *mut libc::c_void
+ self.display as *mut libc::c_void
}
}
diff --git a/src/win32/mod.rs b/src/win32/mod.rs
index 13349f7..33d0600 100644
--- a/src/win32/mod.rs
+++ b/src/win32/mod.rs
@@ -236,7 +236,7 @@ impl Window {
}
pub fn platform_display(&self) -> *mut libc::c_void {
- self.window as *mut libc::c_void
+ unimplemented!()
}
}