aboutsummaryrefslogtreecommitdiffstats
path: root/src/x11
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2014-12-30 08:31:09 +0100
committertomaka <pierre.krieger1708@gmail.com>2014-12-30 08:31:09 +0100
commit32faad403b19f974733ddf531d61dc8d842af288 (patch)
tree0b23538cd302d3bd42c6784a74b0c8df882a74dc /src/x11
parent29bf3385add5ee9306452fe605984838ecfaa1a5 (diff)
parentb9a6366f96e14e396452da443b64a10ee480fabf (diff)
downloadglutin-32faad403b19f974733ddf531d61dc8d842af288.tar.gz
glutin-32faad403b19f974733ddf531d61dc8d842af288.zip
Merge pull request #178 from tomaka/update-rustc
Update for changes in Send/Sync traits
Diffstat (limited to 'src/x11')
-rw-r--r--src/x11/headless.rs3
-rw-r--r--src/x11/window/mod.rs3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/x11/headless.rs b/src/x11/headless.rs
index 95f5233..d6f1023 100644
--- a/src/x11/headless.rs
+++ b/src/x11/headless.rs
@@ -62,3 +62,6 @@ impl Drop for HeadlessContext {
unsafe { ffi::OSMesaDestroyContext(self.context) }
}
}
+
+unsafe impl Send for HeadlessContext {}
+unsafe impl Sync for HeadlessContext {}
diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs
index 422b5b6..0a8c3d5 100644
--- a/src/x11/window/mod.rs
+++ b/src/x11/window/mod.rs
@@ -34,6 +34,9 @@ struct XWindow {
im: ffi::XIM,
}
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
+
impl Drop for XWindow {
fn drop(&mut self) {
unsafe {