From 7a625ef3d8b7fec62222ad6e45f9e1560732ae7a Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Sat, 3 Oct 2015 10:33:37 +0200 Subject: Remove the window feature entirely --- src/api/android/mod.rs | 1 - src/api/cocoa/mod.rs | 4 ---- src/api/glx/mod.rs | 2 +- src/api/x11/mod.rs | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/api') diff --git a/src/api/android/mod.rs b/src/api/android/mod.rs index eef04e8..23440d3 100644 --- a/src/api/android/mod.rs +++ b/src/api/android/mod.rs @@ -283,7 +283,6 @@ impl GlContext for Window { } } -#[cfg(feature = "window")] #[derive(Clone)] pub struct WindowProxy; diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index 5a2f004..2b4b5e5 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -185,12 +185,9 @@ pub struct Window { delegate: WindowDelegate, } -#[cfg(feature = "window")] unsafe impl Send for Window {} -#[cfg(feature = "window")] unsafe impl Sync for Window {} -#[cfg(feature = "window")] #[derive(Clone)] pub struct WindowProxy; @@ -264,7 +261,6 @@ impl<'a> Iterator for WaitEventsIterator<'a> { } impl Window { - #[cfg(feature = "window")] pub fn new(win_attribs: &WindowAttributes, pf_reqs: &PixelFormatRequirements, opengl: &GlAttributes<&Window>) -> Result { diff --git a/src/api/glx/mod.rs b/src/api/glx/mod.rs index 43bb1d7..40ef63c 100644 --- a/src/api/glx/mod.rs +++ b/src/api/glx/mod.rs @@ -1,4 +1,4 @@ -#![cfg(all(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), feature = "window"))] +#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))] use ContextError; use CreationError; diff --git a/src/api/x11/mod.rs b/src/api/x11/mod.rs index d6a8772..7a649ab 100644 --- a/src/api/x11/mod.rs +++ b/src/api/x11/mod.rs @@ -1,4 +1,4 @@ -#![cfg(all(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), feature = "window"))] +#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))] pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor}; pub use self::window::{Window, XWindow, PollEventsIterator, WaitEventsIterator, Context, WindowProxy}; -- cgit v1.2.3