From 0417f7003f133fbef63e8e9d98d305368b1eed47 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Sat, 25 Apr 2015 22:14:30 +0200 Subject: Allow using EGL with X11 --- src/api/egl/ffi.rs | 8 +------- src/api/egl/mod.rs | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/api/egl') diff --git a/src/api/egl/ffi.rs b/src/api/egl/ffi.rs index e3cf32e..8e2528d 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 = "linux")] -use api::x11::ffi; #[cfg(target_os = "android")] use api::android::ffi; @@ -32,10 +30,6 @@ pub type EGLNativePixmapType = *const libc::c_void; // FIXME: egl_native_pix #[cfg(target_os = "windows")] pub type EGLNativeWindowType = winapi::HWND; #[cfg(target_os = "linux")] -pub type EGLNativeWindowType = ffi::Window; +pub type EGLNativeWindowType = *const libc::c_void; #[cfg(target_os = "android")] pub type EGLNativeWindowType = *const ffi::ANativeWindow; - -#[cfg(not(target_os = "windows"))] -#[link(name = "EGL")] -extern {} diff --git a/src/api/egl/mod.rs b/src/api/egl/mod.rs index d9ac313..fdea2cd 100644 --- a/src/api/egl/mod.rs +++ b/src/api/egl/mod.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_os = "windows", target_os = "linux"))] // always false of the moment +#![cfg(target_os = "linux")] use BuilderAttribs; use CreationError; -- cgit v1.2.3