From: Jose Rubio <joserubiovidales@gmail.com>
Date: Tue, 20 Aug 2019 10:52:43 +0000 (+0200)
Subject: Fixes for warnings related to -Wimplicit-int.
X-Git-Tag: 2.3.0a~6^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0c312b207ec6955f067fba26f4ebeea36ab6c27;p=oweals%2Fcde.git

Fixes for warnings related to -Wimplicit-int.
---

diff --git a/cde/programs/dtksh/ksh93/ship/shipfeature.sh b/cde/programs/dtksh/ksh93/ship/shipfeature.sh
index 0e077d80..fc1a26be 100644
--- a/cde/programs/dtksh/ksh93/ship/shipfeature.sh
+++ b/cde/programs/dtksh/ksh93/ship/shipfeature.sh
@@ -435,7 +435,7 @@ $1"
 	?*)	z=$lib
 		e=
 		lib=
-		echo "main(){return(0);}" > $tmp.c
+		echo "int main(){return(0);}" > $tmp.c
 		for x in $z
 		do	case $x in
 			-)	case $lib in
@@ -854,7 +854,7 @@ extern int $v;
 #endif"
 					;;
 				esac
-				echo "main(){char* i = (char*)&$v; return i!=0;}"
+				echo "int main(){char* i = (char*)&$v; return i!=0;}"
 				} > $tmp.c
 				$cc -c $tmp.c <&$nullin >&$nullout &&
 				rm -f $tmp.exe
@@ -1109,7 +1109,7 @@ static struct xxx v;
 struct xxx* f() { return &v; }"
 					;;
 				esac
-				echo "main() { f(); return 0; }"
+				echo "int main() { f(); return 0; }"
 				} > $tmp.c
 				rm -f $tmp.exe
 				if	$cc -o $tmp.exe $tmp.c <&$nullin >&$nullout &&
diff --git a/cde/programs/dtksh/ksh93/ship/shipiffe.sh b/cde/programs/dtksh/ksh93/ship/shipiffe.sh
index a4439802..87f3737a 100644
--- a/cde/programs/dtksh/ksh93/ship/shipiffe.sh
+++ b/cde/programs/dtksh/ksh93/ship/shipiffe.sh
@@ -584,7 +584,7 @@ do	case $in in
 	?*)	z=$lib
 		e=
 		lib=
-		echo "main(){return(0);}" > $tmp.c
+		echo "int main(){return(0);}" > $tmp.c
 		for x in $z
 		do	case $x in
 			-)	case $lib in
@@ -947,13 +947,13 @@ $usr
 _BEGIN_EXTERNS_
 extern int $statictest;
 _END_EXTERNS_
-main(){char* i = (char*)&$statictest; return i!=0;}" > $tmp.c
+int main(){char* i = (char*)&$statictest; return i!=0;}" > $tmp.c
 					rm -f $tmp.exe
 					if	$cc -o $tmp.exe $tmp.c <&$nullin >&$nullout && $executable $tmp.exe
 					then	case $static in
 						.)	static=
 							echo '#include <stdio.h>
-main(){printf("hello");return(0);}' > $tmp.c
+int main(){printf("hello");return(0);}' > $tmp.c
 							rm -f $tmp.exe
 							if	$cc -c $tmp.c <&$nullin >&$nullout && $cc -o $tmp.exe $tmp.o <&$nullin >&$nullout 2>$tmp.e && $executable $tmp.exe
 							then	e=`wc -l $tmp.e`
@@ -1038,7 +1038,7 @@ extern int $v;
 _END_EXTERNS_"
 					;;
 				esac
-				echo "main(){char* i = (char*)&$v; return i!=0;}"
+				echo "int main(){char* i = (char*)&$v; return i!=0;}"
 				} > $tmp.c
 				$cc -c $tmp.c <&$nullin >&$nullout &&
 				rm -f $tmp.exe
@@ -1145,7 +1145,7 @@ $inc
 _BEGIN_EXTERNS_
 extern int $v();
 _END_EXTERNS_
-static int ((*i)())=$v;main(){return(i==0);}" > $tmp.c
+static int ((*i)())=$v;int main(){return(i==0);}" > $tmp.c
 				$cc -c $tmp.c <&$nullin >&$nullout &&
 				rm -f $tmp.exe
 				if	$cc $static -o $tmp.exe $tmp.o $lib $deflib <&$nullin >&$nullout && $executable $tmp.exe
@@ -1389,7 +1389,7 @@ static struct xxx v;
 struct xxx* f() { return &v; }"
 					;;
 				esac
-				echo "main() { f(); return 0; }"
+				echo "int main() { f(); return 0; }"
 				} > $tmp.c
 				rm -f $tmp.exe
 				if	$cc -o $tmp.exe $tmp.c $lib $deflib <&$nullin >&$nullout &&
diff --git a/cde/programs/dtksh/ksh93/ship/shipin b/cde/programs/dtksh/ksh93/ship/shipin
index 70b1f8b2..0aef3e9a 100755
--- a/cde/programs/dtksh/ksh93/ship/shipin
+++ b/cde/programs/dtksh/ksh93/ship/shipin
@@ -262,7 +262,7 @@ $INSTALLROOT/bin/cc)
 		;;
 	*)	_ship_probe_PATH=$PATH
 		case $CC in
-		"")	echo 'main() { return 0; }' > ${_tmp_}0.c
+		"")	echo 'int main() { return 0; }' > ${_tmp_}0.c
 			cat > $_tmp_.c <<'!'
 #include <stdio.h>
 #include <limits.h>
@@ -383,7 +383,7 @@ glue(i, nt)
 #else
 int
 #endif
-main(int argc, char** argv) { return 0; }
+int main(int argc, char** argv) { return 0; }
 #endif
 " > $_tmp_.c
 		if	$CC $CCFLAGS -c $_tmp_.c >/dev/null 2>&1
@@ -400,7 +400,7 @@ main(int argc, char** argv) { return 0; }
 		echo "#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-main() { return socket(0, 0, 0); }" > $_tmp_.c
+int main() { return socket(0, 0, 0); }" > $_tmp_.c
 		for i in "" "-systype bsd43"
 		do	if	$CC $CCFLAGS $i -o $_tmp_.exe $_tmp_.c >/dev/null 2>&1
 			then	case $i in
@@ -1308,13 +1308,13 @@ case $_read_ in
 	eval `(
 	mkdir /tmp/mam$$
 	cd /tmp/mam$$
-	echo 'main(){return 0;}' > main.c
+	echo 'int main(){return 0;}' > main.c
 	if	$CC -c main.c >/dev/null 2>&1
 	then	if	$CC -L. main.o -lc >/dev/null 2>&1
 		then	$CC -L. main.o -lc > libc.a >/dev/null 2>&1 || echo "mam_cc_L=' '"
 		fi
 	fi
-	echo "int f(){return(0);} main(){return(f());}" > pic.c
+	echo "int f(){return(0);} int main(){return(f());}" > pic.c
 	if	$CC -c pic.c >/dev/null 2>e
 	then	e=\`wc -l e\`
 		s=\`wc pic.o\`
diff --git a/cde/programs/dtksh/ksh93/ship/shipop.c b/cde/programs/dtksh/ksh93/ship/shipop.c
index ead47dc8..ecb5281e 100644
--- a/cde/programs/dtksh/ksh93/ship/shipop.c
+++ b/cde/programs/dtksh/ksh93/ship/shipop.c
@@ -260,8 +260,7 @@ static struct optab ops[] =
 	"xap",		shipxap,
 };
 
-int
-main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
+int main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
 	char*	s;
 	int	i;
 
diff --git a/cde/programs/dtksh/ksh93/ship/shipproto.c b/cde/programs/dtksh/ksh93/ship/shipproto.c
index d0eb637f..c1fe1953 100644
--- a/cde/programs/dtksh/ksh93/ship/shipproto.c
+++ b/cde/programs/dtksh/ksh93/ship/shipproto.c
@@ -4929,8 +4929,7 @@ proto __PARAM__((char* file, char* notice, int flags), (file, notice, flags)) __
 	return(flags);
 }
 
-int
-main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
+int main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
 	char*		b;
 	char*		file;
 	int		fd;
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/Mamfile b/cde/programs/dtksh/ksh93/src/cmd/ksh93/Mamfile
index 10282e56..6fa6a414 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/Mamfile
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/Mamfile
@@ -41,12 +41,12 @@ make sh/main.c
 make FEATURE/externs implicit
 make features/externs
 done features/externs
-setv mam_libm `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lm >/dev/null 2>&1 && echo ' -lm'; rm -f x.${!-$$}.[cox])`
-setv mam_libjobs `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ljobs >/dev/null 2>&1 && echo ' -ljobs'; rm -f x.${!-$$}.[cox])`
-setv mam_libi `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -li >/dev/null 2>&1 && echo ' -li'; rm -f x.${!-$$}.[cox])`
-setv mam_libdl `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldl >/dev/null 2>&1 && echo ' -ldl'; rm -f x.${!-$$}.[cox])`
-setv mam_libdld `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldld >/dev/null 2>&1 && echo ' -ldld'; rm -f x.${!-$$}.[cox])`
-setv mam_libintl `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lintl >/dev/null 2>&1 && echo ' -lintl'; rm -f x.${!-$$}.[cox])`
+setv mam_libm `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lm >/dev/null 2>&1 && echo ' -lm'; rm -f x.${!-$$}.[cox])`
+setv mam_libjobs `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ljobs >/dev/null 2>&1 && echo ' -ljobs'; rm -f x.${!-$$}.[cox])`
+setv mam_libi `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -li >/dev/null 2>&1 && echo ' -li'; rm -f x.${!-$$}.[cox])`
+setv mam_libdl `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldl >/dev/null 2>&1 && echo ' -ldl'; rm -f x.${!-$$}.[cox])`
+setv mam_libdld `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldld >/dev/null 2>&1 && echo ' -ldld'; rm -f x.${!-$$}.[cox])`
+setv mam_libintl `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lintl >/dev/null 2>&1 && echo ' -lintl'; rm -f x.${!-$$}.[cox])`
 setv mam_libast ${mam_cc_L+-last}${mam_cc_L-${INSTALLROOT}/lib/libast.a}
 exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/externs
 done FEATURE/externs generated
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/test.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/test.c
index 24658e73..046d608d 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/test.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/test.c
@@ -242,7 +242,7 @@ static char *nxtarg __PARAM__((int mt), (mt)) __OTORP__(int mt;){
 }
 
 
-static e3 __PARAM__((void), ()){
+static int e3 __PARAM__((void), ()){
 	char *arg, *cp;
 	int op;
 	char *binop;
@@ -419,7 +419,7 @@ int test_unop __PARAM__((int op,const char *arg), (op, arg)) __OTORP__(int op;co
 	}
 }
 
-test_binop __PARAM__((int op,const char *left,const char *right), (op, left, right)) __OTORP__(int op;const char *left;const char *right;){
+int test_binop __PARAM__((int op,const char *left,const char *right), (op, left, right)) __OTORP__(int op;const char *left;const char *right;){
 	double lnum,rnum;
 	if(op&TEST_ARITH)
 	{
@@ -484,7 +484,7 @@ static time_t test_time __PARAM__((const char *file1,const char *file2), (file1,
  * return true if inode of two files are the same
  */
 
-test_inode __PARAM__((const char *file1,const char *file2), (file1, file2)) __OTORP__(const char *file1;const char *file2;){
+int test_inode __PARAM__((const char *file1,const char *file2), (file1, file2)) __OTORP__(const char *file1;const char *file2;){
 	struct stat stat1,stat2;
 	if(test_stat(file1,&stat1)>=0  && test_stat(file2,&stat2)>=0)
 		if(stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino)
@@ -498,7 +498,7 @@ test_inode __PARAM__((const char *file1,const char *file2), (file1, file2)) __OT
  * The static buffer statb is shared with test_mode.
  */
 
-sh_access __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
+int sh_access __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
 	if(*name==0)
 		return(-1);
 	if(strmatch(name,(char*)e_devfdNN))
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/completion.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/completion.c
index 99a6ceff..cecd4afb 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/completion.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/completion.c
@@ -127,7 +127,7 @@ static char *overlay __PARAM__((char *str,const char *newstr), (str, newstr)) __
  * mode is '=' cause files to be listed in select format
  */
 
-ed_expand __PARAM__((char outbuff[],int *cur,int *eol,int mode), (outbuff, cur, eol, mode)) __OTORP__(char outbuff[];int *cur;int *eol;int mode;){
+int ed_expand __PARAM__((char outbuff[],int *cur,int *eol,int mode), (outbuff, cur, eol, mode)) __OTORP__(char outbuff[];int *cur;int *eol;int mode;){
 	int offset = staktell();
 	char *staksav = stakptr(0);
 	struct comnod  *comptr = (struct comnod*)stakalloc(sizeof(struct comnod));
@@ -335,7 +335,7 @@ ed_expand __PARAM__((char outbuff[],int *cur,int *eol,int mode), (outbuff, cur,
  * look for edit macro named _i
  * if found, puts the macro definition into lookahead buffer and returns 1
  */
-ed_macro __PARAM__((int i), (i)) __OTORP__(int i;){
+int ed_macro __PARAM__((int i), (i)) __OTORP__(int i;){
 	char *out;
 	Namval_t *np;
 	genchar buff[LOOKAHEAD+1];
@@ -368,7 +368,7 @@ ed_macro __PARAM__((int i), (i)) __OTORP__(int i;){
 /*
  * Enter the fc command on the current history line
  */
-ed_fulledit __PARAM__((void), ()){
+int ed_fulledit __PARAM__((void), ()){
 	char *cp;
 	if(!sh.hist_ptr)
 		return(-1);
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/edit.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/edit.c
index e5c5fa64..97dfe1ab 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/edit.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/edit.c
@@ -274,7 +274,7 @@ void tty_cooked __PARAM__((int fd), (fd)) __OTORP__(int fd;){
  *
 }*/
 
-tty_raw __PARAM__((int fd, int echo), (fd, echo)) __OTORP__(int fd; int echo;){
+int tty_raw __PARAM__((int fd, int echo), (fd, echo)) __OTORP__(int fd; int echo;){
 #ifdef L_MASK
 	struct ltchars lchars;
 #endif	/* L_MASK */
@@ -431,7 +431,7 @@ tty_alt __PARAM__((int fd), (fd)) __OTORP__(int fd;){
 #	    define IEXTEN	0
 #	endif /* IEXTEN */
 
-tty_alt __PARAM__((int fd), (fd)) __OTORP__(int fd;){
+int tty_alt __PARAM__((int fd), (fd)) __OTORP__(int fd;){
 	switch(editb.e_raw)
 	{
 	    case ECHOMODE:
@@ -933,7 +933,7 @@ void	ed_putchar __PARAM__((int c), (c)) __OTORP__(int c;){
  * copy virtual to physical and return the index for cursor in physical buffer
  */
 
-ed_virt_to_phys __PARAM__((genchar *virt,genchar *phys,int cur,int voff,int poff), (virt, phys, cur, voff, poff)) __OTORP__(genchar *virt;genchar *phys;int cur;int voff;int poff;){
+int ed_virt_to_phys __PARAM__((genchar *virt,genchar *phys,int cur,int voff,int poff), (virt, phys, cur, voff, poff)) __OTORP__(genchar *virt;genchar *phys;int cur;int voff;int poff;){
 	genchar *sp = virt;
 	genchar *dp = phys;
 	int c;
@@ -1107,7 +1107,7 @@ int	ed_genlen __PARAM__((const genchar *str), (str)) __OTORP__(const genchar *st
  * returns 1 if string in not in this format, 0 otherwise.
  */
 
-ed_setwidth __PARAM__((const char *string), (string)) __OTORP__(const char *string;){
+int ed_setwidth __PARAM__((const char *string), (string)) __OTORP__(const char *string;){
 	int indx = 0;
 	int state = 0;
 	int c;
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/emacs.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/emacs.c
index 624ae927..73136af3 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/emacs.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/emacs.c
@@ -189,7 +189,7 @@ static void xcommands __PROTO__((int));
 static int cr_ok;
 static	Histloc_t location = { -5, 0 };
 
-ed_emacsread __PARAM__((int fd,char *buff,int scend), (fd, buff, scend)) __OTORP__(int fd;char *buff;int scend;){
+int ed_emacsread __PARAM__((int fd,char *buff,int scend), (fd, buff, scend)) __OTORP__(int fd;char *buff;int scend;){
 	int c;
 	int i;
 	genchar *out;
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/vi.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/vi.c
index 72646b8f..356b8435 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/vi.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/vi.c
@@ -247,7 +247,7 @@ static int	textmod __PROTO__((int,int));
  *
 -*/
 
-ed_viread __PARAM__((int fd, char *shbuf, int nchar), (fd, shbuf, nchar)) __OTORP__(int fd; char *shbuf; int nchar;){
+int ed_viread __PARAM__((int fd, char *shbuf, int nchar), (fd, shbuf, nchar)) __OTORP__(int fd; char *shbuf; int nchar;){
 	int i;			/* general variable */
 	int term_char;		/* read() termination character */
 	char prompt[PRSIZE+2];		/* prompt */
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/ksh.mk b/cde/programs/dtksh/ksh93/src/cmd/ksh93/ksh.mk
index 267026cf..f7e77120 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/ksh.mk
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/ksh.mk
@@ -16,23 +16,23 @@ SHELL=/bin/sh
 YACCFLAGS=-d
 mam_libast=$${mam_cc_L+-last}$${mam_cc_L-${PACKAGE_ast_LIB}/libast.a}
 LPR=lpr
-mam_libdl=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libdl=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -ldl \
 	>/dev/null 2>&1 && echo ' -ldl'; rm -f x.$${!-$$$$}.[cox])`
-mam_libjobs=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libjobs=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -ljobs \
 	>/dev/null 2>&1 && echo ' -ljobs'; rm -f x.$${!-$$$$}.[cox])`
 COTEMP=$$$$
-mam_libintl=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libintl=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -lintl \
 	>/dev/null 2>&1 && echo ' -lintl'; rm -f x.$${!-$$$$}.[cox])`
-mam_libi=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libi=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -li \
 	>/dev/null 2>&1 && echo ' -li'; rm -f x.$${!-$$$$}.[cox])`
 PACKAGE_ast=${INSTALLROOT}
 CPP=${CC} -E
 PR=pr
-mam_libm=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libm=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -lm \
 	>/dev/null 2>&1 && echo ' -lm'; rm -f x.$${!-$$$$}.[cox])`
 INSTALLROOT=../../..
@@ -43,7 +43,7 @@ PACKAGE_ast_LIB=${PACKAGE_ast}/lib
 AR=ar
 AS=as
 TAR=tar
-mam_libdld=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libdld=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -ldld \
 	>/dev/null 2>&1 && echo ' -ldld'; rm -f x.$${!-$$$$}.[cox])`
 CPIO=cpio
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/io.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/io.c
index b938d330..3528f809 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/io.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/io.c
@@ -830,7 +830,7 @@ void	sh_iorestore __PARAM__((int last), (last)) __OTORP__(int last;){
  * returns -1 for failure, 0 for success
  * <mode> is the same as for access()
  */
-sh_ioaccess __PARAM__((int fd,int mode), (fd, mode)) __OTORP__(int fd;int mode;){
+int sh_ioaccess __PARAM__((int fd,int mode), (fd, mode)) __OTORP__(int fd;int mode;){
 	int flags;
 	if(mode==X_OK)
 		return(-1);
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/jobs.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/jobs.c
index f918475f..b6fec896 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/jobs.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/jobs.c
@@ -1230,7 +1230,7 @@ done:
  * disown job if bgflag == 'd'
  */
 
-job_switch __PARAM__((struct process *pw,int bgflag), (pw, bgflag)) __OTORP__(struct process *pw;int bgflag;){
+int job_switch __PARAM__((struct process *pw,int bgflag), (pw, bgflag)) __OTORP__(struct process *pw;int bgflag;){
 	const char *msg;
 	if(!pw || !(pw=job_byjid((int)pw->p_job)))
 		return(1);
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/main.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/main.c
index 1f894e09..1975d014 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/main.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/main.c
@@ -140,7 +140,7 @@ static char	beenhere = 0;
     }
 #endif /* _lib_sigvec */
 
-main __PARAM__((int ac, char *av[]), (ac, av)) __OTORP__(int ac; char *av[];){
+int main __PARAM__((int ac, char *av[]), (ac, av)) __OTORP__(int ac; char *av[];){
 	char	*name;
 	int	fdin;
 	Sfio_t  *iop;
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/shcomp.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/shcomp.c
index 5c24a887..486a50b4 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/shcomp.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/shcomp.c
@@ -102,7 +102,7 @@
 static const char id[] = "\n@(#)shcomp (AT&T Bell Laboratories) 12/28/93\0\n";
 static const char header[6] = { CNTL('k'),CNTL('s'),CNTL('h'),0,VERSION,0 };
 
-main __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
+int main __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
 	Sfio_t *in, *out;
 	union anynode *t;
 	char *cp;
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/suid_exec.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/suid_exec.c
index 3b74f51e..f814980c 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/suid_exec.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/suid_exec.c
@@ -129,7 +129,7 @@ static gid_t rgroupid;
 static gid_t egroupid;
 static struct stat statb;
 
-main __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
+int main __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
 	int m,n;
 	char *p;
 	struct stat statx;
@@ -316,7 +316,7 @@ static void error_exit __PARAM__((const char *message), (message)) __OTORP__(con
  * This version of access checks against effective uid and effective gid
  */
 
-eaccess __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
+int eaccess __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
 	struct stat statb;
 	if (stat(name, &statb) == 0)
 	{
@@ -367,7 +367,7 @@ eaccess __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const ch
 }
 
 #ifdef _lib_setreuid
-setids __PARAM__((int mode,int owner,int group), (mode, owner, group)) __OTORP__(int mode;int owner;int group;){
+int setids __PARAM__((int mode,int owner,int group), (mode, owner, group)) __OTORP__(int mode;int owner;int group;){
 	if(mode & S_ISGID)
 		setregid(rgroupid,group);
 
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 74d2558e..4d119b26 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c
@@ -209,7 +209,7 @@ static int pipe_exec __PARAM__((int pv[], union anynode *t, int errorflg), (pv,
 }
 #endif /* SHOPT_FASTPIPE */
 
-sh_exec __PARAM__((const union anynode *t, int flags), (t, flags)) __OTORP__(const union anynode *t; int flags;){
+int sh_exec __PARAM__((const union anynode *t, int flags), (t, flags)) __OTORP__(const union anynode *t; int flags;){
 	sh_sigcheck();
 	if(t && !sh.st.execbrk && !sh_isoption(SH_NOEXEC))
 	{
@@ -1220,7 +1220,7 @@ sh_exec __PARAM__((const union anynode *t, int flags), (t, flags)) __OTORP__(con
  * returns 1 if r == trim(s) otherwise 0
  */
 
-static trim_eq __PARAM__((const char *r,const char *s), (r, s)) __OTORP__(const char *r;const char *s;){
+static int trim_eq __PARAM__((const char *r,const char *s), (r, s)) __OTORP__(const char *r;const char *s;){
 	char c;
 	while(c = *s++)
 	{
diff --git a/cde/programs/dtksh/ksh93/src/cmd/pax/nocom.c b/cde/programs/dtksh/ksh93/src/cmd/pax/nocom.c
index 0487e864..b845b182 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/pax/nocom.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/pax/nocom.c
@@ -402,6 +402,7 @@ nocom __PARAM__((Sfio_t* sp, char* file), (sp, file)) __OTORP__(Sfio_t* sp; char
 	/*NOTREACHED*/
 }
 
+int
 main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
 	int		c;
 	char*		s;
diff --git a/cde/programs/dtksh/ksh93/src/lib/lib0ast/C.probe b/cde/programs/dtksh/ksh93/src/lib/lib0ast/C.probe
index 649d2a73..059eaa28 100644
--- a/cde/programs/dtksh/ksh93/src/lib/lib0ast/C.probe
+++ b/cde/programs/dtksh/ksh93/src/lib/lib0ast/C.probe
@@ -125,7 +125,7 @@ fi
 mkdir suffix
 cd suffix
 for src in $probe_src
-do	echo "main(){return 0;}" > ../test.$src
+do	echo "int main(){return 0;}" > ../test.$src
 	rm -f test*
 	if	$cc -c ../test.$src
 	then	set test.*
@@ -157,7 +157,7 @@ cd ..
 case $src in
 c)	;;
 *)	echo '// (
-main()
+int main()
 {
 	class { public: int i; } j;
 	j.i = 0;
@@ -217,7 +217,7 @@ do	shift
 done
 
 echo '#include <stdio.h>
-main(){printf("hello");return(0);}' > dynamic.$src
+int main(){printf("hello");return(0);}' > dynamic.$src
 if	$cc -c dynamic.$src
 then	eval set x $probe_so
 	while	:
@@ -297,7 +297,7 @@ then	eval set x $probe_so
 	fi
 fi
 
-echo 'main(){return(0);}' > hosted.$src
+echo 'int main(){return(0);}' > hosted.$src
 $cc -o hosted.$exe hosted.$src && ./hosted.$exe && hosted=1
 
 cp /bin/echo cpp
diff --git a/cde/programs/dtksh/ksh93/src/lib/libAST/C.probe b/cde/programs/dtksh/ksh93/src/lib/libAST/C.probe
index cc6280a9..a591b195 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libAST/C.probe
+++ b/cde/programs/dtksh/ksh93/src/lib/libAST/C.probe
@@ -129,7 +129,7 @@ done
 case $src in
 c)	;;
 *)	echo '#include <iostream.h>
-main()
+int main()
 {
 	cout << "hello world";
 	return 0;
@@ -168,7 +168,7 @@ do	shift
 done
 
 echo '#include <stdio.h>
-main(){printf("hello");return(0);}' > dynamic.$src
+int main(){printf("hello");return(0);}' > dynamic.$src
 if	$cc -c dynamic.$src
 then	eval set x $probe_so
 	while	:
@@ -234,7 +234,7 @@ then	eval set x $probe_so
 	fi
 fi
 
-echo 'main(){return(0);}' > hosted.$src
+echo 'int main(){return(0);}' > hosted.$src
 $cc -o hosted.$exe hosted.$src && ./hosted.$exe && hosted=1
 
 cp /bin/echo cpp
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/align.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/align.c
index 6e73263c..5179ce1e 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/align.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/align.c
@@ -116,7 +116,7 @@ struct _s_
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/botch.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/botch.c
index f9d49eff..7551ff79 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/botch.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/botch.c
@@ -106,7 +106,7 @@
 extern __MANGLE__ int		getgroups __PROTO__((int, gid_t*));
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 #if _lib_getgroups
 	if (sizeof(gid_t) < sizeof(int))
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/fcntl.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/fcntl.c
index fc982d3a..f7442021 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/fcntl.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/fcntl.c
@@ -116,7 +116,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int		f_local = 0;
 	int		f_lck = 0;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/int.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/int.c
index b87620e7..5e77e158 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/int.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/int.c
@@ -130,7 +130,7 @@ static struct
 
 static int	size[] = { 1, 2, 4, 8 };
 
-main()
+int main()
 {
 	int	t;
 	int	s;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/limits.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/limits.c
index 3b8b149a..acd30287 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/limits.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/limits.c
@@ -152,7 +152,7 @@ static char*		cmd[] = { "/bin/echo", 0 };
 #define child()		spawnve(cmd[0],cmd,(char**)0)
 #endif
 
-main()
+int main()
 {
 	int	i;
 	int	n;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/mode.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/mode.c
index 1fac5096..1849b9d5 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/mode.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/mode.c
@@ -105,7 +105,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	n;
 	int	idperm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/signal.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/signal.c
index 62dd3900..bd8cc0be 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/signal.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/signal.c
@@ -256,7 +256,7 @@ static int		index[64];
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/feature/unistd.c b/cde/programs/dtksh/ksh93/src/lib/libast/feature/unistd.c
index 1ef890fd..fcbb3249 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/feature/unistd.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/feature/unistd.c
@@ -131,7 +131,7 @@ __STDPP__directive pragma pp:nohide printf
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 #endif
 
-main()
+int main()
 {
 	int	sep = 0;
 	long	val;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/align.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/align.c
index 787f62d0..4605f9cf 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/align.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/align.c
@@ -108,7 +108,7 @@ struct _s_
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/botch.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/botch.c
index 23071861..69f1d789 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/botch.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/botch.c
@@ -98,7 +98,7 @@
 extern __MANGLE__ int		getgroups __PROTO__((int, gid_t*));
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 #if _lib_getgroups
 	if (sizeof(gid_t) < sizeof(int))
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/fcntl.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/fcntl.c
index 41e8010e..6509c6c7 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/fcntl.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/fcntl.c
@@ -107,7 +107,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int		f_local = 0;
 	int		f_lck = 0;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/int.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/int.c
index df24d74c..c0c5479f 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/int.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/int.c
@@ -122,7 +122,7 @@ static struct
 
 static int	size[] = { 1, 2, 4, 8 };
 
-main()
+int main()
 {
 	int	t;
 	int	s;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/limits.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/limits.c
index 9794c4c0..5713f8fe 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/limits.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/limits.c
@@ -119,7 +119,7 @@ extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
 #include "conflib.h"
 
-main()
+int main()
 {
 	int	i;
 	int	n;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/mode.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/mode.c
index a4e11d5e..5b552db2 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/mode.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/mode.c
@@ -97,7 +97,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	n;
 	int	idperm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/signal.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/signal.c
index 2906bfed..50cf20fc 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/signal.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/signal.c
@@ -278,7 +278,7 @@ static int		index[64];
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/unistd.c b/cde/programs/dtksh/ksh93/src/lib/libast/features/unistd.c
index d8029654..57feee39 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/unistd.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/unistd.c
@@ -118,7 +118,7 @@ extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
 #include "conflib.h"
 
-main()
+int main()
 {
 #include "confuni.h"
 	return(0);
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashwalk.c b/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashwalk.c
index d6e2751a..608a5a4a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashwalk.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/hash/hashwalk.c
@@ -97,7 +97,7 @@
  */
 
 int
-hashwalk __PARAM__((Hash_table_t* tab, int flags, register(*walker)(const char*, char*, __V_*), __V_* handle), (tab, flags, walker, handle)) __OTORP__(Hash_table_t* tab; int flags; register(*walker)(); __V_* handle;){
+hashwalk __PARAM__((Hash_table_t* tab, int flags, int register(*walker)(const char*, char*, __V_*), __V_* handle), (tab, flags, walker, handle)) __OTORP__(Hash_table_t* tab; int flags; int register(*walker)(); __V_* handle;){
 	Hash_bucket_t*	b;
 	int		v;
 	Hash_position_t*	pos;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/misc/ftwalk.c b/cde/programs/dtksh/ksh93/src/lib/libast/misc/ftwalk.c
index 0de74d62..b3718e03 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/misc/ftwalk.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/misc/ftwalk.c
@@ -416,6 +416,7 @@ static int resize __PARAM__((char** home, char** endbuf, char** path, char** bas
 /*
 	The real thing.
 */
+int
 ftwalk __PARAM__((const char *cpath, int (*userf)(Ftw_t*), int flags, int (*comparf)(Ftw_t*, Ftw_t*)), (cpath, userf, flags, comparf)) __OTORP__(const char *cpath; int (*userf)(); int flags; int (*comparf)();){
 	char		*path = (char*)cpath;
 	int	cdrv;		/* chdir value */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfclrerr.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfclrerr.c
index 3744ea12..cb6560dc 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfclrerr.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfclrerr.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfclrerr(reg Sfio_t* f)
+static int __sfclrerr(reg Sfio_t* f)
 #else
 static __sfclrerr(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfclrerr
 
 #if __STD_C
-sfclrerr(reg Sfio_t* f)
+int sfclrerr(reg Sfio_t* f)
 #else
 sfclrerr(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfeof.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfeof.c
index 54435030..7c79d13a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfeof.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfeof.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfeof(reg Sfio_t* f)
+static int __sfeof(reg Sfio_t* f)
 #else
 static __sfeof(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfeof
 
 #if __STD_C
-sfeof(reg Sfio_t* f)
+int sfeof(reg Sfio_t* f)
 #else
 sfeof(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sferror.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sferror.c
index bac5cff2..b7b14cc4 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sferror.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sferror.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sferror(reg Sfio_t* f)
+static int __sferror(reg Sfio_t* f)
 #else
 static __sferror(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sferror
 
 #if __STD_C
-sferror(reg Sfio_t* f)
+int sferror(reg Sfio_t* f)
 #else
 sferror(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sffileno.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sffileno.c
index 2dfef5e8..61496b76 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sffileno.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sffileno.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sffileno(reg Sfio_t* f)
+static int __sffileno(reg Sfio_t* f)
 #else
 static __sffileno(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sffileno
 
 #if __STD_C
-sffileno(reg Sfio_t* f)
+int sffileno(reg Sfio_t* f)
 #else
 sffileno(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfgetc.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfgetc.c
index bbe64e97..746093e6 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfgetc.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfgetc.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfgetc(reg Sfio_t* f)
+static int __sfgetc(reg Sfio_t* f)
 #else
 static __sfgetc(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfgetc
 
 #if __STD_C
-sfgetc(reg Sfio_t* f)
+int sfgetc(reg Sfio_t* f)
 #else
 sfgetc(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputc.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputc.c
index a216beab..8df61ffc 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputc.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputc.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputc(reg Sfio_t* f, reg int c)
+static int __sfputc(reg Sfio_t* f, reg int c)
 #else
 static __sfputc(f,c)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg int		c;
 #undef sfputc
 
 #if __STD_C
-sfputc(reg Sfio_t* f, reg int c)
+int sfputc(reg Sfio_t* f, reg int c)
 #else
 sfputc(f,c)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputd.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputd.c
index 4ce5097b..a8e4c422 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputd.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputd.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputd(reg Sfio_t* f, reg double v)
+static int __sfputd(reg Sfio_t* f, reg double v)
 #else
 static __sfputd(f,v)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg double	v;
 #undef sfputd
 
 #if __STD_C
-sfputd(reg Sfio_t* f, reg double v)
+int sfputd(reg Sfio_t* f, reg double v)
 #else
 sfputd(f,v)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputl.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputl.c
index ae143e92..98e39fda 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputl.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputl.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputl(reg Sfio_t* f, reg long v)
+static int __sfputl(reg Sfio_t* f, reg long v)
 #else
 static __sfputl(f,v)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg long	v;
 #undef sfputl
 
 #if __STD_C
-sfputl(reg Sfio_t* f, reg long v)
+int sfputl(reg Sfio_t* f, reg long v)
 #else
 sfputl(f,v)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputu.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputu.c
index c8591f88..e7080050 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputu.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputu.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputu(reg Sfio_t* f, reg ulong v)
+static int __sfputu(reg Sfio_t* f, reg ulong v)
 #else
 static __sfputu(f,v)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg ulong	v;
 #undef sfputu
 
 #if __STD_C
-sfputu(reg Sfio_t* f, reg ulong v)
+int sfputu(reg Sfio_t* f, reg ulong v)
 #else
 sfputu(f,v)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfslen.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfslen.c
index 6ab0108b..af8ab41d 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfslen.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfslen.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfslen(void)
+static int __sfslen(void)
 #else
 static __sfslen()
 #endif
@@ -57,7 +57,7 @@ static __sfslen()
 #undef sfslen
 
 #if __STD_C
-sfslen(void)
+int sfslen(void)
 #else
 sfslen()
 #endif
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfstacked.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfstacked.c
index 8f5c357e..bb98a759 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfstacked.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfstacked.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfstacked(reg Sfio_t* f)
+static int __sfstacked(reg Sfio_t* f)
 #else
 static __sfstacked(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfstacked
 
 #if __STD_C
-sfstacked(reg Sfio_t* f)
+int sfstacked(reg Sfio_t* f)
 #else
 sfstacked(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfulen.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfulen.c
index 6f6b522d..6130de85 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfulen.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfulen.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfulen(reg ulong v)
+static int __sfulen(reg ulong v)
 #else
 static __sfulen(v)
 reg ulong	v;
@@ -58,7 +58,7 @@ reg ulong	v;
 #undef sfulen
 
 #if __STD_C
-sfulen(reg ulong v)
+int sfulen(reg ulong v)
 #else
 sfulen(v)
 reg ulong	v;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclose.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclose.c
index aff78692..83d200dc 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclose.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclose.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfclose(reg Sfio_t* f)
+int sfclose(reg Sfio_t* f)
 #else
 sfclose(f)
 reg Sfio_t*	f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclrlock.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclrlock.c
index c06e57f1..d656c93d 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclrlock.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclrlock.c
@@ -52,7 +52,7 @@
 **	Written by Kiem-Phong Vo (07/20/90).
 */
 #if __STD_C
-sfclrlock(reg Sfio_t* f)
+int sfclrlock(reg Sfio_t* f)
 #else
 sfclrlock(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfdlen.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfdlen.c
index 20515e21..cb46ef24 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfdlen.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfdlen.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfdlen(reg double v)
+int sfdlen(reg double v)
 #else
 sfdlen(v)
 reg double	v;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfexcept.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfexcept.c
index 62053680..67f66ac5 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfexcept.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfexcept.c
@@ -49,7 +49,7 @@
 **	Written by Kiem-Phong Vo (8/18/90)
 */
 #if __STD_C
-_sfexcept(reg Sfio_t* f, reg int type, reg int io, reg Sfdisc_t* disc)
+int _sfexcept(reg Sfio_t* f, reg int type, reg int io, reg Sfdisc_t* disc)
 #else
 _sfexcept(f,type,io,disc)
 reg Sfio_t	*f;	/* stream where the exception happened */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sffilbuf.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sffilbuf.c
index ac7830bf..3eb64704 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sffilbuf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sffilbuf.c
@@ -56,7 +56,7 @@
 */
 
 #if __STD_C
-_sffilbuf(reg Sfio_t* f, reg int n)
+int _sffilbuf(reg Sfio_t* f, reg int n)
 #else
 _sffilbuf(f,n)
 reg Sfio_t	*f;	/* fill the read buffer of this stream */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfflsbuf.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfflsbuf.c
index 6e880b84..983ef02a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfflsbuf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfflsbuf.c
@@ -52,7 +52,7 @@
 */
 
 #if __STD_C
-_sfflsbuf(reg Sfio_t* f, reg int c)
+int _sfflsbuf(reg Sfio_t* f, reg int c)
 #else
 _sfflsbuf(f,c)
 reg Sfio_t	*f;	/* write out the buffered content of this stream */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfllen.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfllen.c
index fee21031..cc83ec0a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfllen.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfllen.c
@@ -50,7 +50,7 @@
 **	Written by Kiem-Phong Vo (06/27/90)
 */
 #if __STD_C
-sfllen(reg long v)
+int sfllen(reg long v)
 #else
 sfllen(v)
 reg long	v;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfmode.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfmode.c
index 16341ace..d891c5e7 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfmode.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfmode.c
@@ -95,7 +95,7 @@ static void _sfcleanup()
 
 /* put into discrete pool */
 #if __STD_C
-_sfsetpool(Sfio_t* f)
+int _sfsetpool(Sfio_t* f)
 #else
 _sfsetpool(f)
 Sfio_t*	f;
@@ -214,7 +214,7 @@ typedef struct _sfp_
 static Sfpopen_t*	_Sfprocess;
 
 #if __STD_C
-_sfpopen(reg Sfio_t* f, int fd, int pid)
+int _sfpopen(reg Sfio_t* f, int fd, int pid)
 #else
 _sfpopen(f, fd, pid)
 reg Sfio_t*	f;
@@ -245,7 +245,7 @@ int		pid;
 }
 
 #if __STD_C
-_sfpclose(reg Sfio_t* f)
+int _sfpclose(reg Sfio_t* f)
 #else
 _sfpclose(f)
 reg Sfio_t*	f;	/* stream to close */
@@ -307,7 +307,7 @@ reg Sfio_t*	f;	/* stream to close */
 }
 
 #if __STD_C
-static _sfpmode(Sfio_t* f, int type)
+static int _sfpmode(Sfio_t* f, int type)
 #else
 static _sfpmode(f,type)
 Sfio_t*	f;
@@ -413,7 +413,7 @@ int	stack;
 }
 
 #if __STD_C
-_sfmode(reg Sfio_t* f, reg int wanted, reg int local)
+int _sfmode(reg Sfio_t* f, reg int wanted, reg int local)
 #else
 _sfmode(f, wanted, local)
 reg Sfio_t*	f;	/* change r/w mode and sync file pointer for this stream */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnotify.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnotify.c
index bf246bba..d2357162 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnotify.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnotify.c
@@ -51,7 +51,7 @@
 **	Written by Kiem-Phong Vo (01/06/91)
 */
 #if __STD_C
-sfnotify(void (*notify)(Sfio_t*, int, int))
+int sfnotify(void (*notify)(Sfio_t*, int, int))
 #else
 sfnotify(notify)
 void	(*notify)();
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnputc.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnputc.c
index 7d0d199f..40a68d94 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnputc.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnputc.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfnputc(reg Sfio_t* f, reg int c, reg int n)
+int sfnputc(reg Sfio_t* f, reg int c, reg int n)
 #else
 sfnputc(f,c,n)
 reg Sfio_t	*f;	/* file to write */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfopen.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfopen.c
index 54ff9a3e..70260eab 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfopen.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfopen.c
@@ -113,7 +113,7 @@ reg char	*mode;		/* mode of the stream */
 }
 
 #if __STD_C
-_sftype(reg const char *mode, int *oflagsp)
+int _sftype(reg const char *mode, int *oflagsp)
 #else
 _sftype(mode, oflagsp)
 reg char	*mode;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpeek.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpeek.c
index ed11358b..39578df0 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpeek.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpeek.c
@@ -52,7 +52,7 @@
 */
 
 #if __STD_C
-sfpeek(reg Sfio_t* f, Void_t** bp, reg int size)
+int sfpeek(reg Sfio_t* f, Void_t** bp, reg int size)
 #else
 sfpeek(f,bp,size)
 reg Sfio_t*	f;	/* file to peek */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpkrd.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpkrd.c
index 19856573..18daff05 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpkrd.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpkrd.c
@@ -61,7 +61,7 @@
 #define SOCKET_PEEK	002
 
 #if __STD_C
-sfpkrd(int fd, Void_t* argbuf, int n, int rc, long tm, int action)
+int sfpkrd(int fd, Void_t* argbuf, int n, int rc, long tm, int action)
 #else
 sfpkrd(fd, argbuf, n, rc, tm, action)
 int	fd;	/* file descriptor */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpoll.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpoll.c
index cebfec15..9157333f 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpoll.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpoll.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfpoll(Sfio_t** fa, reg int n, int tm)
+int sfpoll(Sfio_t** fa, reg int n, int tm)
 #else
 sfpoll(fa, n, tm)
 Sfio_t**	fa;	/* array of streams to poll */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpool.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpool.c
index 91586459..11affd54 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpool.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpool.c
@@ -106,7 +106,7 @@ reg int	mode;
 
 /* move a stream to head */
 #if __STD_C
-static _sfphead(Sfpool_t* p, Sfio_t* f, int n)
+static int _sfphead(Sfpool_t* p, Sfio_t* f, int n)
 #else
 static _sfphead(p, f, n)
 Sfpool_t*	p;	/* the pool			*/
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfprintf.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfprintf.c
index ab8a4658..b57466a6 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfprintf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfprintf.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfprintf(Sfio_t *f, const char *form, ...)
+int sfprintf(Sfio_t *f, const char *form, ...)
 #else
 sfprintf(va_alist)
 va_dcl
@@ -76,7 +76,7 @@ va_dcl
 }
 
 #if __STD_C
-sfsprintf(char *s, int n, const char *form, ...)
+int sfsprintf(char *s, int n, const char *form, ...)
 #else
 sfsprintf(va_alist)
 va_dcl
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpurge.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpurge.c
index a65389f5..73b5ba87 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpurge.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpurge.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfpurge(reg Sfio_t* f)
+int sfpurge(reg Sfio_t* f)
 #else
 sfpurge(f)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputd.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputd.c
index d44b5a64..ee40910b 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputd.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputd.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-_sfputd(Sfio_t* f, reg double v)
+int _sfputd(Sfio_t* f, reg double v)
 #else
 _sfputd(f,v)
 Sfio_t		*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputl.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputl.c
index 2af5f107..0b7c6246 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputl.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputl.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-_sfputl(reg Sfio_t* f, reg long v)
+int _sfputl(reg Sfio_t* f, reg long v)
 #else
 _sfputl(f,v)
 reg Sfio_t	*f;	/* write a portable long to this stream */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputr.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputr.c
index 7c5a6b95..e74f0a4a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputr.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputr.c
@@ -53,7 +53,7 @@
 **	Written by Kiem-Phong Vo
 */
 #if __STD_C
-sfputr(reg Sfio_t* f, const char* s, reg int rc)
+int sfputr(reg Sfio_t* f, const char* s, reg int rc)
 #else
 sfputr(f,s,rc)
 reg Sfio_t*	f;	/* write to this stream. r11 on Vax	*/
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputu.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputu.c
index 13b90a02..a7f22d7b 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputu.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputu.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-_sfputu(reg Sfio_t* f, reg ulong v)
+int _sfputu(reg Sfio_t* f, reg ulong v)
 #else
 _sfputu(f,v)
 reg Sfio_t	*f;	/* write a portable ulong to this stream */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfrd.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfrd.c
index a6646eac..2734e05c 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfrd.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfrd.c
@@ -77,7 +77,7 @@ static void _sfwrsync()
 }
 
 #if __STD_C
-sfrd(reg Sfio_t* f, reg Void_t* buf, reg int n, reg Sfdisc_t* disc)
+int sfrd(reg Sfio_t* f, reg Void_t* buf, reg int n, reg Sfdisc_t* disc)
 #else
 sfrd(f,buf,n,disc)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfread.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfread.c
index 34f0dbe3..49895a78 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfread.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfread.c
@@ -54,7 +54,7 @@
 */
 
 #if __STD_C
-sfread(reg Sfio_t* f, Void_t* buf, reg int n)
+int sfread(reg Sfio_t* f, Void_t* buf, reg int n)
 #else
 sfread(f,buf,n)
 reg Sfio_t*	f;	/* read from this stream. r11 on Vax	*/
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfscanf.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfscanf.c
index 9bf07f60..8d4329ab 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfscanf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfscanf.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfscanf(Sfio_t *f, const char *form, ...)
+int sfscanf(Sfio_t *f, const char *form, ...)
 #else
 sfscanf(va_alist)
 va_dcl
@@ -76,7 +76,7 @@ va_dcl
 }
 
 #if __STD_C
-sfsscanf(const char *s, const char *form,...)
+int sfsscanf(const char *s, const char *form,...)
 #else
 sfsscanf(va_alist)
 va_dcl
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfset.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfset.c
index 98567d9c..ab545d9b 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfset.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfset.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfset(reg Sfio_t* f, reg int flags, reg int set)
+int sfset(reg Sfio_t* f, reg int flags, reg int set)
 #else
 sfset(f,flags,set)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsetfd.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsetfd.c
index 4d0aa3cb..318c5e09 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsetfd.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsetfd.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-static _sfdup(reg int fd, reg int newfd)
+static int _sfdup(reg int fd, reg int newfd)
 #else
 static _sfdup(fd,newfd)
 reg int	fd;
@@ -80,7 +80,7 @@ reg int	newfd;
 }
 
 #if __STD_C
-sfsetfd(reg Sfio_t* f, reg int newfd)
+int sfsetfd(reg Sfio_t* f, reg int newfd)
 #else
 sfsetfd(f,newfd)
 reg Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsync.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsync.c
index b0fe9bb8..9aba993a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsync.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsync.c
@@ -51,7 +51,7 @@
 **	Written by Kiem-Phong Vo (06/27/90)
 */
 
-static _sfall()
+static int _sfall()
 {
 	reg Sfpool_t	*p, *next;
 	reg Sfio_t*	f;
@@ -102,7 +102,7 @@ static _sfall()
 }
 
 #if __STD_C
-sfsync(reg Sfio_t* f)
+int sfsync(reg Sfio_t* f)
 #else
 sfsync(f)
 reg Sfio_t*	f;	/* stream to be synchronized */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sftmp.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sftmp.c
index 280c18b6..bb1a6ad1 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sftmp.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sftmp.c
@@ -130,7 +130,7 @@ char	*name;
 #endif /*_PACKAGE_ast*/
 
 #if __STD_C
-static _tmpexcept(Sfio_t* f, int type, Sfdisc_t* disc)
+static int _tmpexcept(Sfio_t* f, int type, Sfdisc_t* disc)
 #else
 static _tmpexcept(f,type,disc)
 Sfio_t*		f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfungetc.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfungetc.c
index bfcf88c3..8ed6287d 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfungetc.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfungetc.c
@@ -50,7 +50,7 @@
 **	Written by Kiem-Phong Vo (03/02/91)
 */
 #if __STD_C
-static _uexcept(reg Sfio_t* f, reg int type, reg Sfdisc_t* disc)
+static int _uexcept(reg Sfio_t* f, reg int type, reg Sfdisc_t* disc)
 #else
 static _uexcept(f,type,disc)
 reg Sfio_t	*f;
@@ -70,7 +70,7 @@ reg Sfdisc_t	*disc;
 }
 
 #if __STD_C
-sfungetc(reg Sfio_t* f, reg int c)
+int sfungetc(reg Sfio_t* f, reg int c)
 #else
 sfungetc(f,c)
 reg Sfio_t	*f;	/* push back one byte to this stream */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
index adbe2c74..e47c990e 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
@@ -99,7 +99,7 @@
 	}
 
 #if __STD_C
-sfvprintf(Sfio_t* f, const char* form, va_list args)
+int sfvprintf(Sfio_t* f, const char* form, va_list args)
 #else
 sfvprintf(f,form,args)
 Sfio_t*	f;		/* file to print to	*/
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvscanf.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvscanf.c
index 0ac87875..26ec8987 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvscanf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvscanf.c
@@ -136,7 +136,7 @@ int*	rs;
 }
 
 #if __STD_C
-sfvscanf(Sfio_t* f, reg const char* form, va_list args)
+int sfvscanf(Sfio_t* f, reg const char* form, va_list args)
 #else
 sfvscanf(f,form,args)
 Sfio_t		*f;		/* file to be scanned */
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwr.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwr.c
index b61f371c..afbaf71c 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwr.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwr.c
@@ -52,7 +52,7 @@
 
 /* hole preserving writes */
 #if __STD_C
-static sfoutput(Sfio_t* f, reg char* buf, reg int n)
+static int sfoutput(Sfio_t* f, reg char* buf, reg int n)
 #else
 static sfoutput(f,buf,n)
 Sfio_t*		f;
@@ -144,7 +144,7 @@ reg int		n;
 }
 
 #if __STD_C
-sfwr(reg Sfio_t* f, reg const Void_t* buf, reg int n, reg Sfdisc_t* disc)
+int sfwr(reg Sfio_t* f, reg const Void_t* buf, reg int n, reg Sfdisc_t* disc)
 #else
 sfwr(f,buf,n,disc)
 reg Sfio_t*	f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwrite.c b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwrite.c
index bab07d80..c7f0848e 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwrite.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwrite.c
@@ -54,7 +54,7 @@
 */
 
 #if __STD_C
-sfwrite(reg Sfio_t* f, const Void_t* buf, reg int n)
+int sfwrite(reg Sfio_t* f, const Void_t* buf, reg int n)
 #else
 sfwrite(f,buf,n)
 reg Sfio_t*	f;	/* write to this stream. r11 on Vax	*/
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdprintf.c b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdprintf.c
index c9400a21..70034988 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdprintf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdprintf.c
@@ -53,7 +53,7 @@
 */
 
 #if __STD_C
-_stdprintf(const char *form, ...)
+int _stdprintf(const char *form, ...)
 #else
 _stdprintf(va_alist)
 va_dcl
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdscanf.c b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdscanf.c
index daa404e8..56075d08 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdscanf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdscanf.c
@@ -52,7 +52,7 @@
 */
 
 #if __STD_C
-_stdscanf(const char *form, ...)
+int _stdscanf(const char *form, ...)
 #else
 _stdscanf(va_alist)
 va_dcl
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdsprnt.c b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdsprnt.c
index e4ab2f49..b7333fd8 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdsprnt.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdsprnt.c
@@ -54,7 +54,7 @@
 
 
 #if __STD_C
-_stdsprintf(char *s, const char *form, ...)
+int _stdsprintf(char *s, const char *form, ...)
 #else
 _stdsprintf(va_alist)
 va_dcl
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvbuf.c b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvbuf.c
index b261641e..1545d3f7 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvbuf.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvbuf.c
@@ -52,7 +52,7 @@
 */
 
 #if __STD_C
-_stdsetvbuf(Sfio_t* f, char *buf, int type, int size)
+int _stdsetvbuf(Sfio_t* f, char *buf, int type, int size)
 #else
 _stdsetvbuf(f,buf,type,size)
 Sfio_t	*f;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsnprnt.c b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsnprnt.c
index a6dae6cb..5342a7da 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsnprnt.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsnprnt.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-_stdvsnprintf(char* s, int n, const char* form, va_list args)
+int _stdvsnprintf(char* s, int n, const char* form, va_list args)
 #else
 _stdvsnprintf(s,n,form,args)
 reg char*	s;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsprnt.c b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsprnt.c
index c3028078..4591ccc5 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsprnt.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsprnt.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-_stdvsprintf(char *s, const char *form, va_list args)
+int _stdvsprintf(char *s, const char *form, va_list args)
 #else
 _stdvsprintf(s,form,args)
 char	*s;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsscn.c b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsscn.c
index e81b3d51..b3a7fa84 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsscn.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdvsscn.c
@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-_stdvsscanf(char *s, const char *form, va_list args)
+int _stdvsscanf(char *s, const char *form, va_list args)
 #else
 _stdvsscanf(s,form,args)
 char	*s;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/malloc.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/malloc.c
index e3187310..a3cc5b11 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/malloc.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/malloc.c
@@ -169,7 +169,7 @@ char*	ends;
 }
 
 #if __STD_C
-static createfile(char* file)
+static int createfile(char* file)
 #else
 static createfile(file)
 char*	file;
@@ -212,7 +212,7 @@ static void pfprint()
 		vmprofile(Vmregion,_Vmpffd);
 }
 
-static vmflinit()
+static int vmflinit()
 {
 	char*		env;
 	Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmbest.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmbest.c
index e3fed7e1..9e16055b 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmbest.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmbest.c
@@ -325,7 +325,7 @@ Block_t*	wanted;
 
 /* Reclaim all delayed free blocks into the free tree */
 #if __STD_C
-static bestreclaim(reg Vmdata_t* vd, Block_t* wanted, int c)
+static int bestreclaim(reg Vmdata_t* vd, Block_t* wanted, int c)
 #else
 static bestreclaim(vd, wanted, c)
 reg Vmdata_t*	vd;
@@ -687,7 +687,7 @@ done:
 }
 
 #if __STD_C
-static bestfree(Vmalloc_t* vm, Void_t* data )
+static int bestfree(Vmalloc_t* vm, Void_t* data )
 #else
 static bestfree(vm, data )
 Vmalloc_t*	vm;
@@ -924,7 +924,7 @@ done:
 }
 
 #if __STD_C
-static bestcompact(Vmalloc_t* vm)
+static int bestcompact(Vmalloc_t* vm)
 #else
 static bestcompact(vm)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclear.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclear.c
index 10653721..f781b9c9 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclear.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclear.c
@@ -50,7 +50,7 @@
 **	Written by (Kiem-)Phong Vo, kpv@research.att.com, 01/16/94.
 */
 #if __STD_C
-vmclear(Vmalloc_t* vm)
+int vmclear(Vmalloc_t* vm)
 #else
 vmclear(vm)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclose.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclose.c
index cc6fc0a2..2752543f 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclose.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmclose.c
@@ -50,7 +50,7 @@
 **	Written by (Kiem-)Phong Vo, kpv@research.att.com, 01/16/94.
 */
 #if __STD_C
-vmclose(Vmalloc_t* vm)
+int vmclose(Vmalloc_t* vm)
 #else
 vmclose(vm)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmdebug.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmdebug.c
index c1deaba8..d9b0548c 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmdebug.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmdebug.c
@@ -542,7 +542,7 @@ int		flags;		/* VM_RS*			*/
 
 /* compact any residual free space */
 #if __STD_C
-static dbcompact(Vmalloc_t* vm)
+static int dbcompact(Vmalloc_t* vm)
 #else
 static dbcompact(vm)
 Vmalloc_t*	vm;
@@ -553,7 +553,7 @@ Vmalloc_t*	vm;
 
 /* check for memory overwrites over all live blocks */
 #if __STD_C
-vmdbcheck(Vmalloc_t* vm)
+int vmdbcheck(Vmalloc_t* vm)
 #else
 vmdbcheck(vm)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmlast.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmlast.c
index 5b655783..a501771b 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmlast.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmlast.c
@@ -327,7 +327,7 @@ Void_t*		addr;
 }
 
 #if __STD_C
-static lastcompact(Vmalloc_t* vm)
+static int lastcompact(Vmalloc_t* vm)
 #else
 static lastcompact(vm)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmpool.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmpool.c
index 73e7932c..c0d2f1bf 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmpool.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmpool.c
@@ -265,7 +265,7 @@ Void_t*		addr;
 }
 
 #if __STD_C
-static poolcompact(Vmalloc_t* vm)
+static int poolcompact(Vmalloc_t* vm)
 #else
 static poolcompact(vm)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprivate.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprivate.c
index 7add4d08..a5b9cb60 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprivate.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprivate.c
@@ -213,7 +213,7 @@ Vmsearch_f	searchf;	/* tree search function		*/
 
 /* Truncate a segment if possible */
 #if __STD_C
-vmtruncate(Vmalloc_t* vm, Seg_t* seg, size_t size, int exact)
+int vmtruncate(Vmalloc_t* vm, Seg_t* seg, size_t size, int exact)
 #else
 vmtruncate(vm, seg, size, exact)
 Vmalloc_t*	vm;	/* containing region		*/
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprofile.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprofile.c
index 1d475b8f..34940b1f 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprofile.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmprofile.c
@@ -369,7 +369,7 @@ ulong	size;
 
 /* print profile data */
 #if __STD_C
-vmprofile(Vmalloc_t* vm, int fd)
+int vmprofile(Vmalloc_t* vm, int fd)
 #else
 vmprofile(vm, fd)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmset.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmset.c
index 536be70d..f427435d 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmset.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmset.c
@@ -51,7 +51,7 @@
 **	Written by (Kiem-)Phong Vo, kpv@research.att.com, 01/16/94.
 */
 #if __STD_C
-vmset(reg Vmalloc_t* vm, int flags, int on)
+int vmset(reg Vmalloc_t* vm, int flags, int on)
 #else
 vmset(vm, flags, on)
 reg Vmalloc_t*	vm;	/* region being worked on		*/
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmstat.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmstat.c
index 020070e9..824e5a3f 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmstat.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmstat.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-vmstat(Vmalloc_t* vm, Vmstat_t* st)
+int vmstat(Vmalloc_t* vm, Vmstat_t* st)
 #else
 vmstat(vm, st)
 Vmalloc_t*	vm;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmtrace.c b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmtrace.c
index a2021a4f..d62f826b 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmtrace.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/vmalloc/vmtrace.c
@@ -162,7 +162,7 @@ size_t		size;		/* size of piece		*/
 }
 
 #if __STD_C
-vmtrace(int file)
+int vmtrace(int file)
 #else
 vmtrace(file)
 int	file;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libcmd/Mamfile b/cde/programs/dtksh/ksh93/src/lib/libcmd/Mamfile
index 6c603413..64e6e046 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libcmd/Mamfile
+++ b/cde/programs/dtksh/ksh93/src/lib/libcmd/Mamfile
@@ -76,7 +76,7 @@ make FEATURE/symlink implicit
 make features/symlink
 done features/symlink
 make cmd.req
-exec - echo 'main(){return(0);}' > 1.${COTEMP}.c
+exec - echo 'int main(){return(0);}' > 1.${COTEMP}.c
 exec - ${CC} ${CCFLAGS}    -c 1.${COTEMP}.c &&
 exec - set +x
 exec - x=`${CC} ${CCFLAGS}    ${LDFLAGS}  -o 1.${COTEMP}.x 1.${COTEMP}.o -l'*' 2>&1 | sed -e 's/[][()+@?]/#/g' || :` &&
diff --git a/cde/programs/dtksh/ksh93/src/lib/libcmd/wclib.c b/cde/programs/dtksh/ksh93/src/lib/libcmd/wclib.c
index 44c35c34..f7e2050f 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libcmd/wclib.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libcmd/wclib.c
@@ -116,7 +116,7 @@ Wc_t *wc_init __PARAM__((char *space), (space)) __OTORP__(char *space;){
 /*
  * compute the line, word, and character count for file <fd>
  */
-wc_count __PARAM__((Wc_t *wp, Sfio_t *fd), (wp, fd)) __OTORP__(Wc_t *wp; Sfio_t *fd;){
+int wc_count __PARAM__((Wc_t *wp, Sfio_t *fd), (wp, fd)) __OTORP__(Wc_t *wp; Sfio_t *fd;){
 	signed char	*space = wp->space;
 	unsigned char	*cp;
 	long		nwords;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libvdelta/vddelta.c b/cde/programs/dtksh/ksh93/src/lib/libvdelta/vddelta.c
index ef6554eb..4491b8be 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libvdelta/vddelta.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libvdelta/vddelta.c
@@ -80,7 +80,7 @@ struct _table_s
 
 /* encode and output delta instructions */
 #if __STD_C
-static vdputinst(Table_t* tab, uchar* begs, uchar* here, Match_t* match, int n_copy)
+static int vdputinst(Table_t* tab, uchar* begs, uchar* here, Match_t* match, int n_copy)
 #else
 static vdputinst(tab, begs, here, match, n_copy)
 Table_t*	tab;
@@ -181,7 +181,7 @@ int		n_copy;	/* length of match	*/
 
 /* Fold a string */
 #if __STD_C
-static vdfold(Table_t* tab, int output)
+static int vdfold(Table_t* tab, int output)
 #else
 static vdfold(tab, output)
 Table_t*	tab;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdio.c b/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdio.c
index ed48ffaa..dfef8ab3 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdio.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdio.c
@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-static _vdinit(reg Vdio_t* io)
+static int _vdinit(reg Vdio_t* io)
 #else
 static _vdinit(io)
 reg Vdio_t*	io;
@@ -69,7 +69,7 @@ reg Vdio_t*	io;
 
 
 #if __STD_C
-static _vdfilbuf(reg Vdio_t* io)
+static int _vdfilbuf(reg Vdio_t* io)
 #else
 static _vdfilbuf(io)
 reg Vdio_t*	io;
@@ -90,7 +90,7 @@ reg Vdio_t*	io;
 }
 
 #if __STD_C
-static _vdflsbuf(reg Vdio_t* io)
+static int _vdflsbuf(reg Vdio_t* io)
 #else
 static _vdflsbuf(io)
 reg Vdio_t*	io;
@@ -131,7 +131,7 @@ reg ulong	v;
 }
 
 #if __STD_C
-static _vdputu(reg Vdio_t* io, ulong v)
+static int _vdputu(reg Vdio_t* io, ulong v)
 #else
 static _vdputu(io, v)
 reg Vdio_t*	io;
@@ -165,7 +165,7 @@ reg ulong	v;
 }
 
 #if __STD_C
-static _vdread(Vdio_t* io, reg uchar* s, reg int n)
+static int _vdread(Vdio_t* io, reg uchar* s, reg int n)
 #else
 static _vdread(io, s, n)
 Vdio_t*		io;
@@ -192,7 +192,7 @@ reg int		n;
 }
 
 #if __STD_C
-static _vdwrite(Vdio_t* io, reg uchar* s, reg int n)
+static int _vdwrite(Vdio_t* io, reg uchar* s, reg int n)
 #else
 static _vdwrite(io, s, n)
 Vdio_t*		io;
diff --git a/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdupdate.c b/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdupdate.c
index 3b2d1c76..270d1f15 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdupdate.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libvdelta/vdupdate.c
@@ -75,7 +75,7 @@ typedef struct _table_s
 } Table_t;
 
 #if __STD_C
-static vdunfold(Table_t* tab)
+static int vdunfold(Table_t* tab)
 #else
 static vdunfold(tab)
 Table_t*	tab;