From 18f846403b7f1893510744a58d9b347122658411 Mon Sep 17 00:00:00 2001 From: Andrey Lesnikov Date: Fri, 6 May 2016 00:01:40 +0300 Subject: Updated to android_glue 0.2 --- Cargo.toml | 2 +- src/api/android/ffi.rs | 5 +++-- 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; -- cgit v1.2.3