Merge pull request #665 from antrik/fix-cast_32bit-upstream

Fix compilation for 32 bit targets
This commit is contained in:
tomaka 2015-11-30 22:44:58 +01:00
commit 5b819eda9a

View file

@ -8,6 +8,7 @@ use std::cell::Cell;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::os::raw::c_long;
use Api; use Api;
use ContextError; use ContextError;
@ -539,7 +540,7 @@ impl Window {
// This first `long` is the action; `1` means add/set following property. // This first `long` is the action; `1` means add/set following property.
data.set_long(0, 1); data.set_long(0, 1);
// This second `long` is the property to set (fullscreen) // This second `long` is the property to set (fullscreen)
data.set_long(1, fullscreen_atom as i64); data.set_long(1, fullscreen_atom as c_long);
data data
} }
}; };