diff options
| author | cyclopsian <43323938+cyclopsian@users.noreply.github.com> | 2019-10-20 12:31:00 +0000 |
|---|---|---|
| committer | Christian Duerr <contact@christianduerr.com> | 2019-10-20 14:30:59 +0200 |
| commit | 8a263414572d8ed4d771461de2fdbd9f7e549a75 (patch) | |
| tree | b3a654881f8a5e8a4967c6b3a3bae8ad64bb74a3 | |
| parent | a75e9493449d90b54a140b76f6a96b684784a059 (diff) | |
| download | alacritty-8a263414572d8ed4d771461de2fdbd9f7e549a75.tar.gz alacritty-8a263414572d8ed4d771461de2fdbd9f7e549a75.zip | |
Fix XEmbed compilation error on 32-bit platforms
| -rw-r--r-- | alacritty/src/window.rs | 3 | ||||
| -rw-r--r-- | alacritty_terminal/src/config/window.rs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/alacritty/src/window.rs b/alacritty/src/window.rs index 28ef4480..1d4ef612 100644 --- a/alacritty/src/window.rs +++ b/alacritty/src/window.rs @@ -15,6 +15,7 @@ use std::convert::From; #[cfg(not(any(target_os = "macos", windows)))] use std::ffi::c_void; use std::fmt; +use std::os::raw::c_ulong; use glutin::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize}; use glutin::event_loop::EventLoop; @@ -392,7 +393,7 @@ impl Window { } #[cfg(not(any(target_os = "macos", windows)))] -fn x_embed_window(window: &GlutinWindow, parent_id: u64) { +fn x_embed_window(window: &GlutinWindow, parent_id: c_ulong) { let (xlib_display, xlib_window) = match (window.xlib_display(), window.xlib_window()) { (Some(display), Some(window)) => (display, window), _ => return, diff --git a/alacritty_terminal/src/config/window.rs b/alacritty_terminal/src/config/window.rs index 3c06f85e..9b86ba8a 100644 --- a/alacritty_terminal/src/config/window.rs +++ b/alacritty_terminal/src/config/window.rs @@ -1,3 +1,5 @@ +use std::os::raw::c_ulong; + use serde::Deserialize; use crate::config::{ @@ -45,7 +47,7 @@ pub struct WindowConfig { /// XEmbed parent #[serde(skip)] - pub embed: Option<u64>, + pub embed: Option<c_ulong>, /// GTK theme variant #[serde(deserialize_with = "option_explicit_none")] |