From b9a6366f96e14e396452da443b64a10ee480fabf Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 29 Dec 2014 22:56:15 +0100
Subject: Update for changes in Send/Sync traits

---
 src/win32/init.rs |  8 +++++++-
 src/win32/mod.rs  | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'src/win32')

diff --git a/src/win32/init.rs b/src/win32/init.rs
index 3cdf8d5..7b236b0 100644
--- a/src/win32/init.rs
+++ b/src/win32/init.rs
@@ -18,11 +18,15 @@ use winapi;
 ///  receive an event for another window.
 thread_local!(static WINDOW: Rc<RefCell<Option<(winapi::HWND, Sender<Event>)>>> = Rc::new(RefCell::new(None)));
 
+/// Work-around the fact that HGLRC doesn't implement Send
+pub struct ContextHack(pub winapi::HGLRC);
+unsafe impl Send for ContextHack {}
+
 pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: String,
                   builder_monitor: Option<super::MonitorID>,
                   builder_gl_version: Option<(uint, uint)>, builder_debug: bool,
                   builder_vsync: bool, builder_hidden: bool,
-                  builder_sharelists: Option<winapi::HGLRC>, builder_multisampling: Option<u16>)
+                  builder_sharelists: Option<ContextHack>, builder_multisampling: Option<u16>)
                   -> Result<Window, CreationError>
 {
     use std::mem;
@@ -38,6 +42,8 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
     //  so we create a new thread dedicated to this window.
     // This is the only safe method. Using `nosend` wouldn't work for non-native runtime.
     ::std::thread::Thread::spawn(move || {
+        let builder_sharelists = builder_sharelists.map(|s| s.0);
+
         // registering the window class
         let class_name = {
             let class_name: Vec<u16> = "Window Class".utf16_units().chain(Some(0).into_iter())
diff --git a/src/win32/mod.rs b/src/win32/mod.rs
index dba08e5..a5f0547 100644
--- a/src/win32/mod.rs
+++ b/src/win32/mod.rs
@@ -51,6 +51,11 @@ impl HeadlessContext {
     }
 }
 
+#[cfg(feature = "headless")]
+unsafe impl Send for HeadlessContext {}
+#[cfg(feature = "headless")]
+unsafe impl Sync for HeadlessContext {}
+
 /// The Win32 implementation of the main `Window` object.
 pub struct Window {
     /// Main handle for the window.
@@ -75,6 +80,9 @@ pub struct Window {
     is_closed: AtomicBool,
 }
 
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
+
 #[cfg(feature = "window")]
 impl Window {
     /// See the docs in the crate root file.
@@ -82,7 +90,8 @@ impl Window {
         let WindowBuilder { dimensions, title, monitor, gl_version,
                             gl_debug, vsync, visible, sharing, multisampling } = builder;
         init::new_window(dimensions, title, monitor, gl_version, gl_debug, vsync,
-                         !visible, sharing.map(|w| w.window.context), multisampling)
+                         !visible, sharing.map(|w| init::ContextHack(w.window.context)),
+                         multisampling)
     }
 }
 
-- 
cgit v1.2.3