X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=link%2Fz80%2Flkmain.c;h=745504b8495c52eac4e17914b8c009e08610c404;hb=c23ad1a2833573f366363e6c4273bc4f20bf767c;hp=4f029de0c5d313609280a6f937bb660adca21680;hpb=229bba4eecf7df0f36ac070ddc3b69e84f385354;p=fw%2Fsdcc

diff --git a/link/z80/lkmain.c b/link/z80/lkmain.c
index 4f029de0..745504b8 100644
--- a/link/z80/lkmain.c
+++ b/link/z80/lkmain.c
@@ -1,5 +1,4 @@
 /* lkmain.c */
-
 /*
  * (C) Copyright 1989-1995
  * All Rights Reserved
@@ -15,13 +14,14 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <alloc.h>
+//#include <alloc.h>
 #include "aslink.h"
+#include <stdlib.h>
 
 #ifndef SDK_VERSION_STRING
 #define SDK_VERSION_STRING 	"3.0.0"
 #endif
-#ifdef TARGET_STRING
+#ifndef TARGET_STRING
 #define TARGET_STRING		"gbz80"
 #endif
 
@@ -158,12 +158,12 @@ char *default_globlp[] = {
 };
 #endif /* GAMEBOY */
 
-VOID
+int
 main(argc, argv)
 char *argv[];
 {
 	register char *p;
-	register c, i;
+	register int c, i;
 
 #ifdef GAMEBOY
 	nb_rom_banks = 2;
@@ -244,7 +244,7 @@ char *argv[];
 			}
 		}
 	}
-	if (startp->f_type == NULL)
+	if (startp->f_type == F_INV)
 		usage();
 	if (startp->f_type == F_LNK && startp->f_idp == NULL)
 		usage();
@@ -262,7 +262,7 @@ char *argv[];
 			break;
 		if (pflag && sfp != stdin)
 			fprintf(stdout, "%s\n", ip);
-		if (*ip == NULL || parse())
+		if (*ip == '\0' || parse())
 			break;
 	}
 	if (sfp)
@@ -285,7 +285,7 @@ char *argv[];
 		bsp->b_base = (struct base *)new(sizeof(struct base));
 		bsp = bsp->b_base;
 		bsp->b_strp = (char *)malloc(18);
-		sprintf(bsp->b_strp, "_BSS_%d=0xA000", i);
+		sprintf(bsp->b_strp, "_DATA_%d=0xA000", i);
 	}
 #endif /* GAMEBOY */
 
@@ -377,6 +377,9 @@ char *argv[];
 		}
 	}
 	lkexit(lkerr);
+
+        /* Never get here. */
+        return 0;
 }
 
 /*)Function	VOID	lkexit(i)
@@ -450,7 +453,7 @@ int i;
 VOID
 link()
 {
-	register c;
+	register int c;
 
 	if ((c=endline()) == 0) { return; }
 	switch (c) {
@@ -682,7 +685,6 @@ map()
 #else
 VOID map()
 {
-	register i;
 	register struct head *hdp;
 	register struct lbfile *lbfh;
 
@@ -773,12 +775,11 @@ VOID map()
 #endif /* MLH_MAP */
 
 #ifdef SDK
+/* PENDING */
+VOID lstareatosym(struct area *xp);
+
 VOID sym()
 {
-	register i;
-	register struct head *hdp;
-	register struct lbfile *lbfh;
-
 	/*
 	 * Open sym File
 	 */
@@ -850,7 +851,7 @@ VOID sym()
 int
 parse()
 {
-	register c;
+	register int c;
 	char fid[NINPUT];
 
 	while ((c = getnb()) != 0) {
@@ -892,8 +893,6 @@ parse()
 							while(get() != '"')
 								;
 					} else if(c == 'P' || c == 'p') {
-						unsigned int addr;
-						unsigned char value;
 						patch *p = patches;
 
 						patches = (patch *)malloc(sizeof(patch));
@@ -1076,7 +1075,7 @@ bassav()
  *		int	lkerr		error flag
  *
  *	 functions called:
- *		addr_t	expr()		lkeval.c
+ *		Addr_T	expr()		lkeval.c
  *		int	fprintf()	c_library
  *		VOID	getid()		lklex.c
  *		char	getnb()		lklex.c
@@ -1089,7 +1088,7 @@ bassav()
 VOID
 setbas()
 {
-	register v;
+	register int v;
 	char id[NCPS];
 
 	bsp = basep;
@@ -1186,7 +1185,7 @@ gblsav()
  *		int	lkerr		error flag
  *
  *	 functions called:
- *		addr_t	expr()		lkeval.c
+ *		Addr_T	expr()		lkeval.c
  *		int	fprintf()	c_library
  *		VOID	getid()		lklex.c
  *		char	getnb()		lklex.c
@@ -1199,7 +1198,7 @@ gblsav()
 VOID
 setgbl()
 {
-	register v;
+	register int v;
 	register struct sym *sp;
 	char id[NCPS];
 
@@ -1281,7 +1280,7 @@ char *fn;
 char *ft;
 {
 	register char *p1, *p2, *p3;
-	register c;
+	register int c;
 	FILE *fp;
 	char fb[FILSPC];