logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 83373dc765c71f4e77b6d741591b5a4df6e64dd1
parent f3381bb880a2379d9c3763d3237d60bfd723abc7
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 29 Apr 2025 00:49:58 -0700

rc: Fix build with gcc 15.1.0

Diffstat:

Apkg/rc/patch/0003-Use-complete-function-prototype-to-fix-build-with-C2.patch34++++++++++++++++++++++++++++++++++
Mpkg/rc/ver2+-
2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pkg/rc/patch/0003-Use-complete-function-prototype-to-fix-build-with-C2.patch b/pkg/rc/patch/0003-Use-complete-function-prototype-to-fix-build-with-C2.patch @@ -0,0 +1,34 @@ +From 39da3936cd5cf89e97de197181a05bb405e114b9 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Tue, 29 Apr 2025 00:48:53 -0700 +Subject: [PATCH] Use complete function prototype to fix build with C23 + +--- + unix.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/unix.c b/unix.c +index 3f7bf9d..7052075 100644 +--- a/unix.c ++++ b/unix.c +@@ -402,7 +402,7 @@ gettrap(int sig) + ntrap++; + if(ntrap>=NSIG){ + pfmt(err, "rc: Too many traps (trap %d), dumping core\n", sig); +- signal(SIGABRT, (void (*)())0); ++ signal(SIGABRT, (void (*)(int))0); + kill(getpid(), SIGABRT); + } + } +@@ -411,7 +411,7 @@ void + Trapinit(void) + { + int i; +- void (*sig)(); ++ void (*sig)(int); + + if(1 || flag['d']){ /* wrong!!! */ + sig = signal(SIGINT, gettrap); +-- +2.49.0 + diff --git a/pkg/rc/ver b/pkg/rc/ver @@ -1 +1 @@ -50b729e65d r0 +50b729e65d r1