patch 9.1.0437: Motif requires non-const char pointer for XPM data
Commit:
https://github.com/vim/vim/commit/742062f31faca14ae479f4688a5ad8add5d5c120
Author: Drew Vogel <dvogel@github>
Date: Thu May 23 17:49:39 2024 +0200
patch 9.1.0437: Motif requires non-const char pointer for XPM data
Problem: Motif requires non-const char pointer for XPM data shared with
GTK (Tony Mechelynck, after v9.1.0432)
Solution: Cast non-const to const char pointer for GTK (Drew Vogel).
closes: #14834
Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/vim16x16.xpm b/runtime/vim16x16.xpm
index 9b55218cc..cb75b7178 100644
--- a/runtime/vim16x16.xpm
+++ b/runtime/vim16x16.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static const char * vim16x16[] = {
+static char * vim16x16[] = {
"16 16 8 1",
" c None",
". c #000000",
diff --git a/runtime/vim32x32.xpm b/runtime/vim32x32.xpm
index 017b93b6f..43a3a40c0 100644
--- a/runtime/vim32x32.xpm
+++ b/runtime/vim32x32.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static const char * vim32x32[] = {
+static char * vim32x32[] = {
"32 32 8 1",
" c None",
". c #000000",
diff --git a/runtime/vim48x48.xpm b/runtime/vim48x48.xpm
index 8bd08bc5a..b2fdd9592 100644
--- a/runtime/vim48x48.xpm
+++ b/runtime/vim48x48.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static const char * vim48x48[] = {
+static char * vim48x48[] = {
"48 48 8 1",
" c None",
". c #000000",
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 066aa1745..67ee531b6 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2727,9 +2727,9 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data
UNUSED)
*/
GList *icons = NULL;
- icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim16x16));
- icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim32x32));
- icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim48x48));
+ icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char
**)vim16x16));
+ icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char
**)vim32x32));
+ icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char
**)vim48x48));
gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons);
diff --git a/src/version.c b/src/version.c
index 98ec4754e..7188cbd88 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 437,
/**/
436,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sAArL-002bNN-Ou%40256bit.org.
