aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Lesnikov <ozkriff@gmail.com>2016-05-06 00:01:40 +0300
committerAndrey Lesnikov <ozkriff@gmail.com>2016-05-06 00:01:40 +0300
commit18f846403b7f1893510744a58d9b347122658411 (patch)
treecbdc0e6acf1a3f4e4e739ca8fc6ac6a71870586b
parent93c88ee54d365ce6804c1cab56ecc600e792263f (diff)
downloadglutin-18f846403b7f1893510744a58d9b347122658411.tar.gz
glutin-18f846403b7f1893510744a58d9b347122658411.zip
Updated 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 ddf6844..173b6a9 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;