X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fz80%2Fassym.c;h=dadce441f877dc1f2c63538fbbd4f8355910222f;hb=30357bade4ba51536bdf52d60db2a3c96251a1ff;hp=8b8a6ae1bf87953c79b4c1c52abfa56af5f10881;hpb=b09af35f2f1cde7649d3ac4a6f5d2af6d97895a0;p=fw%2Fsdcc

diff --git a/as/z80/assym.c b/as/z80/assym.c
index 8b8a6ae1..dadce441 100644
--- a/as/z80/assym.c
+++ b/as/z80/assym.c
@@ -12,7 +12,13 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <string.h>
-#include <alloc.h>
+#include <stdlib.h>
+#if defined(__APPLE__) && defined(__MACH__)
+#include <sys/types.h>
+#include <sys/malloc.h>
+#else
+#include <malloc.h>
+#endif
 #include "asm.h"
 
 /*)Module	assym.c
@@ -80,7 +86,7 @@ syminit()
 	struct mne **mpp;
 	register struct sym  *sp;
 	struct sym **spp;
-	register h;
+	register int h;
 
 	mpp = &mnehash[0];
 	while (mpp < &mnehash[NHASH])
@@ -176,7 +182,7 @@ mlookup(id)
 char *id;
 {
 	register struct mne *mp;
-	register h;
+	register int h;
 
 	h = hash(id);
 	mp = mnehash[h];
@@ -221,7 +227,7 @@ lookup(id)
 char *id;
 {
 	register struct sym *sp;
-	register h;
+	register int h;
 
 	h = hash(id);
 	sp = symhash[h];
@@ -268,7 +274,7 @@ VOID
 symglob()
 {
 	register struct sym *sp;
-	register i;
+	register int i;
 
 	for (i=0; i<NHASH; ++i) {
 		sp = symhash[i];
@@ -305,7 +311,7 @@ VOID
 allglob()
 {
 	register struct sym *sp;
-	register i;
+	register int i;
 
 	for (i=0; i<NHASH; ++i) {
 		sp = symhash[i];
@@ -344,7 +350,7 @@ int
 symeq(p1, p2)
 register char *p1, *p2;
 {
-	register n;
+	register int n;
 
 	n = NCPS;
 	do {
@@ -353,7 +359,7 @@ register char *p1, *p2;
 		if (*p1++ != *p2++)
 			return (0);
 #else
-		if (ccase[*p1++] != ccase[*p2++])
+		if (ccase[(unsigned char)(*p1++)] != ccase[(unsigned char)(*p2++)])
 			return (0);
 #endif
 
@@ -387,7 +393,7 @@ int
 hash(p)
 register char *p;
 {
-	register h, n;
+	register int h, n;
 
 	h = 0;
 	n = NCPS;
@@ -396,7 +402,7 @@ register char *p;
 #if	CASE_SENSITIVE
 		h += *p++;
 #else
-		h += ccase[*p++];
+		h += ccase[(unsigned char)(*p++)];
 #endif
 
 	} while (--n);