aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2016-05-25 21:22:13 +0200
committertomaka <pierre.krieger1708@gmail.com>2016-05-25 21:22:13 +0200
commit11faacefd749d6248abaf776fc8c2fbda827e1b3 (patch)
tree9c898dfeb87bf18e6a18f6f6f4e7f3c4b7331b58
parente796a2e01841dcd55e1633bf4d13e993eb547876 (diff)
parent18f846403b7f1893510744a58d9b347122658411 (diff)
downloadglutin-11faacefd749d6248abaf776fc8c2fbda827e1b3.tar.gz
glutin-11faacefd749d6248abaf776fc8c2fbda827e1b3.zip
Merge pull request #772 from ozkriff/master
Update to android_glue 0.2
-rw-r--r--Cargo.toml2
-rw-r--r--src/api/android/ffi.rs5
2 files changed, 4 insertions, 3 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 467d123..1f3bb61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ shared_library = "0.1.0"
gl_generator = "0.5"
[target.'cfg(target_os = "android")'.dependencies.android_glue]
-version = "0.1"
+version = "0.2"
[target.'cfg(target_os = "ios")'.dependencies]
objc = "0.2"
diff --git a/src/api/android/ffi.rs b/src/api/android/ffi.rs
index 1398b77..af8c50b 100644
--- a/src/api/android/ffi.rs
+++ b/src/api/android/ffi.rs
@@ -4,6 +4,7 @@
#![allow(non_upper_case_globals)]
use libc;
+use std::os::raw;
#[link(name = "android")]
#[link(name = "EGL")]
@@ -13,12 +14,12 @@ extern {}
/**
* asset_manager.h
*/
-pub type AAssetManager = ();
+pub type AAssetManager = raw::c_void;
/**
* native_window.h
*/
-pub type ANativeWindow = ();
+pub type ANativeWindow = raw::c_void;
extern {
pub fn ANativeWindow_getHeight(window: *const ANativeWindow) -> libc::int32_t;