X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fz80%2Faslex.c;h=c6cbbd7a85d2093d6e3218102eca05e94985307e;hb=1b938a5aed15c13cd3e4d5d4a6e2da7c08e87c9d;hp=3fadd787933a0511208f6ae7512a678db0c12c36;hpb=b09af35f2f1cde7649d3ac4a6f5d2af6d97895a0;p=fw%2Fsdcc

diff --git a/as/z80/aslex.c b/as/z80/aslex.c
index 3fadd787..c6cbbd7a 100644
--- a/as/z80/aslex.c
+++ b/as/z80/aslex.c
@@ -84,7 +84,7 @@
 
 VOID
 getid(id, c)
-register c;
+register int c;
 char *id;
 {
 	register char *p;
@@ -150,7 +150,7 @@ char *id;
 
 VOID
 getst(id, c)
-register c;
+register int c;
 char *id;
 {
 	register char *p;
@@ -193,7 +193,7 @@ char *id;
 char
 getnb()
 {
-	register c;
+	register int c;
 
 	while ((c=get()) == ' ' || c == '\t')
 		;
@@ -226,7 +226,7 @@ getnb()
 char
 get()
 {
-	register c;
+	register int c;
 
 	if ((c = *ip) != 0)
 		++ip;
@@ -302,7 +302,7 @@ unget(c)
 int
 getmap(d)
 {
-	register c, n, v;
+	register int c, n, v;
 
 	if ((c=get()) == '\0')
 		qerr();
@@ -403,7 +403,7 @@ getmap(d)
 int
 getline()
 {
-register i;
+register int i;
 
 loop:	if (incfil >= 0) {
 		if (fgets(ib, sizeof ib, ifp[incfil]) == NULL) {
@@ -432,6 +432,8 @@ loop:	if (incfil >= 0) {
 	i = strlen(ib) - 1;
 	if (ib[i] == '\n')
 		ib[i] = 0;
+	if (i >= 1 && ib[i-1] == '\r')
+		ib[i-1] = 0;
 	return (1);
 }
 
@@ -461,7 +463,7 @@ loop:	if (incfil >= 0) {
 int
 more()
 {
-	register c;
+	register int c;
 
 	c = getnb();
 	unget(c);
@@ -493,7 +495,7 @@ more()
 char
 endline()
 {
-	register c;
+	register int c;
 
 	c = getnb();
 	return( (c == '\0' || c == ';') ? 0 : c );