Merge pull request #772 from ozkriff/master

Update to android_glue 0.2
2016-05-25 21:22:13 +02:00 · 2016-05-25 21:22:13 +02:00 · 11faacefd7
commit 11faacefd7
parent e796a2e018 18f846403b
2 changed files with 4 additions and 3 deletions
--- 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;