From ef2c655f552b3ca3210a5580993057937fa8fa7c Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 23 Sep 2025 21:15:22 +0200 Subject: [PATCH] Use NULL instead of nullptr NULL is standard for long enough in POSIX to always be available, while C23 introduced nullptr as a new constant, creating a conflict here. --- cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c index 879adb77a..55403f34e 100644 --- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c +++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c @@ -1963,7 +1963,7 @@ int sh_exec(register const Shnode_t *t, int flags) int flag = errorflg|OPTIMIZE_FLAG; struct dolnod *argsav=0; struct comnod *tp; - char *cp, *trap, *nullptr = 0; + char *cp, *trap; int nameref, refresh=1; char *av[5]; #if SHOPT_OPTIMIZE @@ -2008,7 +2008,7 @@ int sh_exec(register const Shnode_t *t, int flags) save_prompt = sh.nextprompt; sh.nextprompt = 3; sh.timeout = 0; - sh.exitval=sh_readline(&nullptr,0,1,(size_t)0,1000*sh.st.tmout); + sh.exitval=sh_readline(NULL,0,1,(size_t)0,1000*sh.st.tmout); sh.nextprompt = save_prompt; if(sh.exitval||sfeof(sfstdin)||sferror(sfstdin)) {