From 50e5715ca5646d0ac28adc89c07db2005d57cebb Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 30 May 2025 21:17:07 -0400 Subject: [PATCH] fix X11 warning with gcc-15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../win/X11/winX.c: In function ‘init_standard_windows’: ../win/X11/winX.c:2769:46: warning: passing argument 2 of ‘XtAppSetErrorHandler’ makes ‘__attribute__((noreturn))’ qualified function pointer from unqualified [-Wdiscarded-qualifiers] 2769 | (void) XtAppSetErrorHandler(app_context, X11_error_handler); | ^~~~~~~~~~~~~~~~~ In file included from ../win/X11/winX.c:27: /usr/include/X11/Intrinsic.h:1771:5: note: expected ‘__attribute__((noreturn)) void (*)(char *)’ but argument is of type ‘void (*)(char *)’ 1771 | XtErrorHandler /* handler */ _X_NORETURN | ^ --- win/X11/winX.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win/X11/winX.c b/win/X11/winX.c index db95dea15..54c3579f6 100644 --- a/win/X11/winX.c +++ b/win/X11/winX.c @@ -100,7 +100,7 @@ int click_x, click_y, click_button; /* Click position on a map window int updated_inventory; /* used to indicate perm_invent updating */ color_attr X11_menu_promptstyle = { NO_COLOR, ATR_NONE }; -static void X11_error_handler(String) NORETURN; +ATTRNORETURN static void X11_error_handler(String) NORETURN; static int X11_io_error_handler(Display *); static int (*old_error_handler)(Display *, XErrorEvent *); @@ -175,7 +175,7 @@ static void X11_sig_cb(XtPointer, XtSignalId *); #endif static void d_timeout(XtPointer, XtIntervalId *); static void X11_hangup(Widget, XEvent *, String *, Cardinal *); -static void X11_bail(const char *) NORETURN; +ATTRNORETURN static void X11_bail(const char *) NORETURN; static void askname_delete(Widget, XEvent *, String *, Cardinal *); static void askname_done(Widget, XtPointer, XtPointer); static void done_button(Widget, XtPointer, XtPointer);