From c73d8cff202cfaa1f0de671bab6d3ce24d1e21a8 Mon Sep 17 00:00:00 2001
From: Kirill Chibisov <contact@kchibisov.com>
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 f3a0f6d2c3..a399e03468 100644
--- a/src/changelog/unreleased.md
+++ b/src/changelog/unreleased.md
@@ -39,3 +39,7 @@ The migration guide could reference other migration examples in the current
 changelog entry.
 
 ## Unreleased
+
+### 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 aa046af67b..89a241cce3 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::<usize, unsafe extern "C" fn(ffi::XIM, *mut i8, *mut i8)>(
+            mem::transmute::<usize, unsafe extern "C" fn(ffi::XIM, ffi::XPointer, ffi::XPointer)>(
                 preedit_start_callback as usize,
             )
         });