From 0eaa8fd9eb4b38169701804b0c0de273c1e73b50 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Fri, 1 May 2015 09:44:35 +0200 Subject: Use the EGL API with Android --- src/api/egl/ffi.rs | 4 +--- src/api/egl/mod.rs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/api/egl') diff --git a/src/api/egl/ffi.rs b/src/api/egl/ffi.rs index 8e2528d..5fa6384 100644 --- a/src/api/egl/ffi.rs +++ b/src/api/egl/ffi.rs @@ -2,8 +2,6 @@ use libc; #[cfg(target_os = "windows")] extern crate winapi; -#[cfg(target_os = "android")] -use api::android::ffi; pub mod egl { pub type khronos_utime_nanoseconds_t = super::khronos_utime_nanoseconds_t; @@ -32,4 +30,4 @@ pub type EGLNativeWindowType = winapi::HWND; #[cfg(target_os = "linux")] pub type EGLNativeWindowType = *const libc::c_void; #[cfg(target_os = "android")] -pub type EGLNativeWindowType = *const ffi::ANativeWindow; +pub type EGLNativeWindowType = *const libc::c_void; diff --git a/src/api/egl/mod.rs b/src/api/egl/mod.rs index a6b6bcc..b2fe2c6 100644 --- a/src/api/egl/mod.rs +++ b/src/api/egl/mod.rs @@ -1,4 +1,4 @@ -#![cfg(target_os = "linux")] +#![cfg(any(target_os = "linux", target_os = "android"))] use BuilderAttribs; use CreationError; -- cgit v1.2.3