Pre 2.95-2

[fw/sdcc] / link / z80 / lkmain.c

diff --git a/link/z80/lkmain.c b/link/z80/lkmain.c
index 1d59a2a7c7b18a937aa52c8c0468ad843d564616..ddff705e3d359e812d5471076da4614bff7e4be7 100644 (file)
--- a/link/z80/lkmain.c
+++ b/link/z80/lkmain.c
@@ -1,5 +1,4 @@
 /* lkmain.c */
-
 /*
  * (C) Copyright 1989-1995
  * All Rights Reserved
@@ -18,6 +17,13 @@
 #include <alloc.h>
 #include "aslink.h"
 
+#ifndef SDK_VERSION_STRING
+#define SDK_VERSION_STRING     "3.0.0"
+#endif
+#ifndef TARGET_STRING
+#define TARGET_STRING          "gbz80"
+#endif
+
 /*)Module      lkmain.c
  *
  *     The module lkmain.c contains the functions which
@@ -151,12 +157,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;
@@ -278,7 +284,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 */
 
@@ -443,7 +449,7 @@ int i;
 VOID
 link()
 {
-       register c;
+       register int c;
 
        if ((c=endline()) == 0) { return; }
        switch (c) {
@@ -675,7 +681,6 @@ map()
 #else
 VOID map()
 {
-       register i;
        register struct head *hdp;
        register struct lbfile *lbfh;
 
@@ -768,10 +773,6 @@ VOID map()
 #ifdef SDK
 VOID sym()
 {
-       register i;
-       register struct head *hdp;
-       register struct lbfile *lbfh;
-
        /*
         * Open sym File
         */
@@ -843,7 +844,7 @@ VOID sym()
 int
 parse()
 {
-       register c;
+       register int c;
        char fid[NINPUT];
 
        while ((c = getnb()) != 0) {
@@ -1082,7 +1083,7 @@ bassav()
 VOID
 setbas()
 {
-       register v;
+       register int v;
        char id[NCPS];
 
        bsp = basep;
@@ -1192,7 +1193,7 @@ gblsav()
 VOID
 setgbl()
 {
-       register v;
+       register int v;
        register struct sym *sp;
        char id[NCPS];
 
@@ -1274,7 +1275,7 @@ char *fn;
 char *ft;
 {
        register char *p1, *p2, *p3;
-       register c;
+       register int c;
        FILE *fp;
        char fb[FILSPC];