aboutsummaryrefslogtreecommitdiffstats
path: root/src/platform
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-10-03 16:22:39 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-10-03 16:22:39 +0200
commit819c5f679b14376e4c89245e68880f40aff22039 (patch)
treed3d37fe03b9a2d49567f797f97925206ed3a172e /src/platform
parentc8fd077e17f7a7147d6877f2343c82790b187bd2 (diff)
parent7a625ef3d8b7fec62222ad6e45f9e1560732ae7a (diff)
downloadglutin-819c5f679b14376e4c89245e68880f40aff22039.tar.gz
glutin-819c5f679b14376e4c89245e68880f40aff22039.zip
Merge pull request #626 from tomaka/rm-window-feature
Remove the window feature entirely
Diffstat (limited to 'src/platform')
-rw-r--r--src/platform/linux/api_dispatch.rs4
-rw-r--r--src/platform/linux/mod.rs8
2 files changed, 1 insertions, 11 deletions
diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs
index cb35b26..aa1ba58 100644
--- a/src/platform/linux/api_dispatch.rs
+++ b/src/platform/linux/api_dispatch.rs
@@ -1,6 +1,4 @@
-/*#[cfg(feature = "window")]
-pub use api::x11::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor};
-#[cfg(feature = "window")]
+/*pub use api::x11::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor};
pub use api::x11::{WaitEventsIterator, PollEventsIterator};*/
use std::collections::VecDeque;
diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs
index 4f97d5c..c984926 100644
--- a/src/platform/linux/mod.rs
+++ b/src/platform/linux/mod.rs
@@ -11,18 +11,10 @@ use libc;
use api::osmesa::{self, OsMesaContext};
-#[cfg(feature = "window")]
pub use self::api_dispatch::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor};
-#[cfg(feature = "window")]
pub use self::api_dispatch::{WaitEventsIterator, PollEventsIterator};
-#[cfg(feature = "window")]
mod api_dispatch;
-#[cfg(not(feature = "window"))]
-pub type Window = (); // TODO: hack to make things work
-#[cfg(not(feature = "window"))]
-pub type MonitorId = (); // TODO: hack to make things work
-
pub struct HeadlessContext(OsMesaContext);
impl HeadlessContext {