Unify WindowBuilder and HeadlessRendererBuilder for easier implementations

2 files changed, 4 insertions, 5 deletions

diff --git a/src/osx/headless.rs b/src/osx/headless.rs
index 1332cf3..39c8f50 100644
--- a/src/osx/headless.rs
+++ b/src/osx/headless.rs
@@ -1,6 +1,6 @@
 use CreationError;
 use CreationError::OsError;
-use HeadlessRendererBuilder;
+use BuilderAttribs;
 use libc;
 use std::ptr;
 
@@ -30,7 +30,7 @@ pub struct HeadlessContext {
 }
 
 impl HeadlessContext {
-    pub fn new(builder: HeadlessRendererBuilder) -> Result<HeadlessContext, CreationError> {
+    pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
         let (width, height) = builder.dimensions;
         let context = unsafe {
             let attributes = [
diff --git a/src/osx/mod.rs b/src/osx/mod.rs
index 92ef641..b65f67a 100644
--- a/src/osx/mod.rs
+++ b/src/osx/mod.rs
@@ -5,8 +5,7 @@ use {CreationError, Event};
 use CreationError::OsError;
 use libc;
 
-#[cfg(feature = "window")]
-use WindowBuilder;
+use BuilderAttribs;
 
 use cocoa::base::{id, NSUInteger, nil, objc_allocateClassPair, class, objc_registerClassPair};
 use cocoa::base::{selector, msg_send, class_addMethod, class_addIvar};
@@ -63,7 +62,7 @@ pub struct Window {
 
 #[cfg(feature = "window")]
 impl Window {
-    pub fn new(builder: WindowBuilder) -> Result<Window, CreationError> {
+    pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
         if builder.sharing.is_some() {
             unimplemented!()
         }