* registobmp/main.c, vte.c, wayland/ui_display.c:

Fix errors in -Werror=incompatible-pointer-types.
arakiken · Aug 14, 2024 · 5b131b7 · 5b131b7
1 parent 5767e5a
commit 5b131b7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2024-08-14  Araki Ken  <arakiken@users.sf.net>
+
+	* registobmp/main.c, vte.c, wayland/ui_display.c:
+	  Fix errors in -Werror=incompatible-pointer-types.
+
 2024-08-13  Araki Ken  <arakiken@users.sf.net>
 
 	* im_canna.c: Fix "pointer type mismatch in conditional expression" error.

diff --git a/doc/en/ReleaseNote b/doc/en/ReleaseNote
@@ -11,6 +11,7 @@
 * Support Alternate Scroll Mode. (https://github.com/arakiken/mlterm/issues/80)
 * Support P2=1 in sixel graphics. (https://github.com/arakiken/mlterm/issues/81)
 * Support libpng to build mlimgloader if gdk-pixbuf is not found.
+  (https://github.com/arakiken/mlterm/issues/96)
 * Add --conpty/use_conpty and --winsize/output_xtwinops_in_resizing options in win32.
 * Add --norepkey/mod_keys_to_stop_mouse_report option.
 * Add tool/accessories/applycfg.sh and applyfontcfg.sh
@@ -31,6 +32,8 @@
   https://github.com/arakiken/mlterm/issues/73
   https://github.com/arakiken/mlterm/issues/78
   https://github.com/arakiken/mlterm/issues/79
+  https://github.com/arakiken/mlterm/issues/92
+  https://github.com/arakiken/mlterm/issues/103
   Fix an issue where mlconfig was not displayed.
   Fix an issue where Control+Shift+xxx shortcut didn't work in SDL2.
   Fix unexpected reset of inverted colors in selected area in SDL2.

diff --git a/gtk/vte.c b/gtk/vte.c
@@ -405,7 +405,7 @@ static gboolean search_find(VteTerminal *terminal, int backward) {
   }
 
 #if VTE_CHECK_VERSION(0, 46, 0)
-  regex = PVT(terminal)->gregex ? PVT(terminal)->gregex : PVT(terminal)->vregex;
+  regex = PVT(terminal)->gregex ? ((void*)PVT(terminal)->gregex) : ((void*)PVT(terminal)->vregex);
 #else
   regex = PVT(terminal)->gregex;
 #endif

diff --git a/tool/registobmp/main.c b/tool/registobmp/main.c
@@ -441,7 +441,7 @@ static char *command_text(char *cmd) {
         mat = FcFontMatch(0, pat, &result);
         FcPatternDestroy(pat);
 
-        if (FcPatternGetString(mat, FC_FILE, 0, &font_file) != FcResultMatch ||
+        if (FcPatternGetString(mat, FC_FILE, 0, (FcChar8**)&font_file) != FcResultMatch ||
             !(font_file = strdup(font_file))) {
           font_file = "arial.ttf";
         }

diff --git a/uitoolkit/wayland/ui_display.c b/uitoolkit/wayland/ui_display.c
@@ -218,7 +218,7 @@ static ui_display_t *add_root_to_display(ui_display_t *disp, ui_window_t *root,
   }
 
   memcpy(new, disp, sizeof(ui_display_t));
-  new->display = new + 1;
+  new->display = (Display*)(new + 1);
   new->name = strdup(disp->name);
 
   memcpy(new->display, disp->display, sizeof(Display));