aports/main/sqsh/c23.patch
Arne de Bruijn 06fde43cf3 main/sqsh: fix build with gcc-15
Rename variable named bool and add argument to signal handlers.

Ref #17311
2025-08-06 05:55:01 +00:00

54 lines
1.5 KiB
Diff

--- sqsh-2.5/src/dsp_meta.c
+++ /home/arne/sqsh-2.5/src/dsp_meta.c
@@ -635,9 +635,9 @@
CS_INT type;
CS_CHAR *desc;
{
- CS_BOOL bool;
+ CS_BOOL boolval;
- if (ct_res_info(cmd, type, (CS_VOID*)&bool,
+ if (ct_res_info(cmd, type, (CS_VOID*)&boolval,
CS_UNUSED, (CS_INT*)NULL) != CS_SUCCEED)
{
dsp_fprintf( out, "dsp_meta_bool_prop: Failed fetching %s\n", desc );
@@ -646,8 +646,8 @@
else
{
dsp_fprintf( out, " %-20s = %s\n",
- desc, ((bool == CS_TRUE) ? "CS_TRUE" :
- ((bool == CS_FALSE) ? "CS_FALSE": "<INVALID>")) );
+ desc, ((boolval == CS_TRUE) ? "CS_TRUE" :
+ ((boolval == CS_FALSE) ? "CS_FALSE": "<INVALID>")) );
}
return CS_SUCCEED;
--- sqsh-2.5/src/sqsh_sig.c
+++ /home/arne/sqsh-2.5/src/sqsh_sig.c
@@ -66,14 +66,14 @@
/*-- Local Globals --*/
static struct {
- RETSIGTYPE (*s_installed)(); /* Which OS handler is installed */
+ RETSIGTYPE (*s_installed)(int); /* Which OS handler is installed */
hndl_t *s_hndl; /* User handlers to call */
} sg_sigs[SQSH_NSIGS];
static int sg_depth = 0; /* Depth within save/restore stack */
/*-- Prototypes --*/
-static RETSIGTYPE sig_handler();
+static RETSIGTYPE sig_handler(int);
/*
* sig_install():
@@ -88,7 +88,7 @@
int flags;
{
hndl_t *h;
- RETSIGTYPE (*sig_func)();
+ RETSIGTYPE (*sig_func)(int);
#if defined(HAVE_SIGACTION)
struct sigaction sa;