mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-14 00:52:35 +02:00
46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
https://bugs.gentoo.org/944197
|
|
https://github.com/vifm/vifm/commit/a31fcbb13a1a52fecff5f5ebaa9ea2d23c059edf
|
|
|
|
From a31fcbb13a1a52fecff5f5ebaa9ea2d23c059edf Mon Sep 17 00:00:00 2001
|
|
From: Sergei Trofimovich <slyich@gmail.com>
|
|
Date: Mon, 18 Nov 2024 06:50:44 +0000
|
|
Subject: [PATCH] src/int/term_title.c: : fix build against -std=c23 (`void
|
|
(*)()`) changed the meaning)
|
|
|
|
gcc-15 switched to -std=c23 by default:
|
|
|
|
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
|
|
|
|
As a result `vifm` fails the build as:
|
|
|
|
int/term_title.c: In function 'get_x11_window_title':
|
|
int/term_title.c:364:21: error:
|
|
assignment to 'int (*)(void)' from incompatible pointer type 'XErrorHandler' {aka 'int (*)(Display *, XErrorEvent *)'} [-Wincompatible-pointer-types-Wincompatible-pointer-types]
|
|
364 | old_handler = XSetErrorHandlerWrapper(x_error_check);
|
|
| ^
|
|
int/term_title.c:367:47: error:
|
|
passing argument 1 of 'XSetErrorHandlerWrapper' from incompatible pointer type [-Wincompatible-pointer-types]
|
|
367 | (void)XSetErrorHandlerWrapper(old_handler);
|
|
| ^~~~~~~~~~~
|
|
| |
|
|
| int (*)(void)
|
|
|
|
The changes fully specifies `old_handler` type.
|
|
---
|
|
src/int/term_title.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/int/term_title.c b/src/int/term_title.c
|
|
index 17327632d..202ca5a9e 100644
|
|
--- a/src/int/term_title.c
|
|
+++ b/src/int/term_title.c
|
|
@@ -358,7 +358,7 @@ get_x11_disp_and_win(Display **disp, Window *win)
|
|
static void
|
|
get_x11_window_title(Display *disp, Window win, char *buf, size_t buf_len)
|
|
{
|
|
- int (*old_handler)();
|
|
+ int (*old_handler)(Display *, XErrorEvent *);
|
|
XTextProperty text_prop;
|
|
|
|
old_handler = XSetErrorHandlerWrapper(x_error_check);
|
|
|