diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2015-10-03 16:22:39 +0200 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2015-10-03 16:22:39 +0200 |
| commit | 819c5f679b14376e4c89245e68880f40aff22039 (patch) | |
| tree | d3d37fe03b9a2d49567f797f97925206ed3a172e /src/api | |
| parent | c8fd077e17f7a7147d6877f2343c82790b187bd2 (diff) | |
| parent | 7a625ef3d8b7fec62222ad6e45f9e1560732ae7a (diff) | |
| download | glutin-819c5f679b14376e4c89245e68880f40aff22039.tar.gz glutin-819c5f679b14376e4c89245e68880f40aff22039.zip | |
Merge pull request #626 from tomaka/rm-window-feature
Remove the window feature entirely
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/android/mod.rs | 1 | ||||
| -rw-r--r-- | src/api/cocoa/mod.rs | 4 | ||||
| -rw-r--r-- | src/api/glx/mod.rs | 2 | ||||
| -rw-r--r-- | src/api/x11/mod.rs | 2 |
4 files changed, 2 insertions, 7 deletions
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<Window, CreationError> { 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}; |