From: David Given <dg@cowlark.com>
Date: Mon, 1 Jun 2015 19:36:24 +0000 (+0200)
Subject: More compiler fixes; mismatched function prototype for gcc, some
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=0d8ae07706fdf49fdc6d217a30e92544e7e8408e;p=FUZIX.git

More compiler fixes; mismatched function prototype for gcc, some
smallification and const casts for cc65.
---

diff --git a/Applications/V7/cmd/sh/main.c b/Applications/V7/cmd/sh/main.c
index ac4b9d64..5fc039e0 100644
--- a/Applications/V7/cmd/sh/main.c
+++ b/Applications/V7/cmd/sh/main.c
@@ -18,6 +18,7 @@
 #include	"timeout.h"
 #include	<sys/types.h>
 #include	<sys/stat.h>
+#include    <setjmp.h>
 
 UFD output = 2;
 static BOOL beenhere = FALSE;
diff --git a/Applications/V7/cmd/sh/service.c b/Applications/V7/cmd/sh/service.c
index 4e9c6512..6a3dfbec 100644
--- a/Applications/V7/cmd/sh/service.c
+++ b/Applications/V7/cmd/sh/service.c
@@ -149,7 +149,7 @@ static const char *execs(const char *ap, const char *t[])
 	trim(p = curstak());
 
 	sigchk();
-	execve(p, &t[0], (const char **)xecenv);
+	execve(p, (char**) &t[0], (char **)xecenv);
 	switch (errno) {
 	case ENOEXEC:
 		flags = 0;
diff --git a/Applications/levee/modify.c b/Applications/levee/modify.c
index 71ad4b07..24aa0dc4 100644
--- a/Applications/levee/modify.c
+++ b/Applications/levee/modify.c
@@ -138,7 +138,7 @@ chop(int start, int *endd, bool visual, bool *query)
 /*>>>>
     bool ok;
   <<<<*/
-    char dest[DSIZE];
+    static char dest[DSIZE];
     register int len, dlen;
     
     retval = -1;
diff --git a/Applications/levee/proto.h b/Applications/levee/proto.h
index 72707afb..2c930c95 100644
--- a/Applications/levee/proto.h
+++ b/Applications/levee/proto.h
@@ -66,7 +66,7 @@ int  PROC findfwd(char  *pattern,int  start,int  endp);
 int  PROC fixcore(int  *topp);
 void PROC fixmarkers(int  base,int  offset);
 int  PROC fixupline(int  dft);
-int  PROC format(char  *out,unsigned short  c);
+int  PROC format(char  *out,unsigned c);
 int  PROC fseekeol(int  origin);
 int  PROC gcount(void);
 int  PROC getKey(void);
@@ -158,7 +158,7 @@ int  PROC writefile(void);
 int  PROC writeline(int  y,int  x,int  start);
 int  PROC zdraw(char  code);
 int  PROC zerostack(struct  undostack *u);
-void main(int  argc,char  * *argv);
+void main(int  argc,char *argv[]);
 void PROC initcon(void);
 void PROC fixcon(void);
 #endif  /*_PROTO_D*/