From: Shamus Hammons <jlhamm@acm.org>
Date: Sun, 1 Nov 2015 15:14:52 +0000 (-0600)
Subject: Fix for bug #46 (thanks to ggn for reporting!).
X-Git-Tag: v2.1.0~192
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=commitdiff_plain;h=e86444a037c470d010786006fbcaa7d6b56effdb

Fix for bug #46 (thanks to ggn for reporting!).
---

diff --git a/direct.c b/direct.c
index 643f031..0cee4b3 100644
--- a/direct.c
+++ b/direct.c
@@ -35,19 +35,19 @@ int (*dirtab[])() = {
 	d_unimpl,			// 2 .6502
 	d_68000,			// 3 .68000
 	d_bss,				// 4 bss
-	d_data,				7// 5 data
+	d_data,				// 5 data
 	d_text,				// 6 text
 	d_abs,				// 7 abs
 	d_comm,				// 8 comm
-	(void *)d_init,			// 9 init
+	(void *)d_init,		// 9 init
 	d_cargs,			// 10 cargs
-	(void *)d_goto,			// 11 goto
-	(void *)d_dc,			// 12 dc
-	(void *)d_ds,			// 13 ds
+	(void *)d_goto,		// 11 goto
+	(void *)d_dc,		// 12 dc
+	(void *)d_ds,		// 13 ds
 	d_undmac,			// 14 undefmac
 	d_gpu,				// 15 .gpu
 	d_dsp,				// 16 .dsp
-	(void *)d_dcb,			// 17 dcb
+	(void *)d_dcb,		// 17 dcb
 	d_unimpl,			// 18* set
 	d_unimpl,			// 19* reg
 	d_unimpl,			// 20 dump
diff --git a/expr.c b/expr.c
index 07391ac..50d1f5a 100644
--- a/expr.c
+++ b/expr.c
@@ -194,7 +194,7 @@ getsym:
 			if (*tok != SYMBOL && *tok != STRING)
 				return error(str_error);
 
-			p = string[tok[1]];
+			p2 = string[tok[1]];
 			tok += 2;
 
 			w = (WORD)(!strcmp(p, p2));
diff --git a/version.h b/version.h
index 92dead7..c919999 100644
--- a/version.h
+++ b/version.h
@@ -13,6 +13,6 @@
 
 #define MAJOR   1		// Major version number
 #define MINOR   3		// Minor version number
-#define PATCH   14		// Patch release number
+#define PATCH   15		// Patch release number
 
 #endif // __VERSION_H__