Make SIG_DFL / SIG_IGN C++ compatible

This commit is contained in:
Justine Tunney 2022-09-05 08:43:52 -07:00
parent d721ff8938
commit 8cd4248f7f
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
2 changed files with 5 additions and 5 deletions

View file

@ -97,8 +97,8 @@ static relegated void ttyraw_onsig(int sig, struct siginfo *info,
}
for (i = 0; i < ARRAYLEN(g_ttyraw.sigs); ++i) {
if (g_ttyraw.sigs[i] == sig) {
if (g_ttyraw.next[i] != SIG_IGN) {
if (g_ttyraw.next[i] != SIG_DFL) {
if (g_ttyraw.next[i] != (void *)SIG_IGN) {
if (g_ttyraw.next[i] != (void *)SIG_DFL) {
if (g_ttyraw.next[i]) {
g_ttyraw.next[i](sig, info, ctx);
}
@ -117,7 +117,7 @@ static textstartup void ttyraw_initsig(int sig, unsigned flags, unsigned mask) {
struct sigaction old;
g_ttyraw.next[i] = xsigaction(sig, ttyraw_onsig, flags, mask, &old) != -1
? old.sa_sigaction
: SIG_DFL;
: (void *)SIG_DFL;
g_ttyraw.sigs[i++] = sig;
}

View file

@ -17,8 +17,8 @@
#define __WCLONE 0x80000000 /* Wait only on non-SIGCHLD children */
#define SIG_ERR ((void (*)(int))(-1))
#define SIG_DFL ((void *)0)
#define SIG_IGN ((void *)1)
#define SIG_DFL ((void (*)(int))0)
#define SIG_IGN ((void (*)(int))1)
#define MAP_FAILED ((void *)-1)