From d8ffd4bb26d7039be6e817d904753625de5af4fd Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Mon, 17 Jun 2024 13:51:08 +0300 Subject: [PATCH] x11: fix build on arm The c_char type, which was used under the hood is different depending on arch, thus use it directly instead of i8. Fixes #3735. --- src/changelog/unreleased.md | 4 ++++ src/platform_impl/linux/x11/ime/context.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/changelog/unreleased.md b/src/changelog/unreleased.md index 6f2a1f63..a0ac5e70 100644 --- a/src/changelog/unreleased.md +++ b/src/changelog/unreleased.md @@ -50,3 +50,7 @@ changelog entry. - Remove `EventLoop::run`. - Remove `EventLoopExtRunOnDemand::run_on_demand`. - Remove `EventLoopExtPumpEvents::pump_events`. + +### Fixed + +- On X11, build on arm platforms. diff --git a/src/platform_impl/linux/x11/ime/context.rs b/src/platform_impl/linux/x11/ime/context.rs index aa046af6..89a241cc 100644 --- a/src/platform_impl/linux/x11/ime/context.rs +++ b/src/platform_impl/linux/x11/ime/context.rs @@ -158,7 +158,7 @@ struct PreeditCallbacks { impl PreeditCallbacks { pub fn new(client_data: ffi::XPointer) -> PreeditCallbacks { let start_callback = create_xim_callback(client_data, unsafe { - mem::transmute::( + mem::transmute::( preedit_start_callback as usize, ) });