X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=macro.c;h=6e9fd864af4eb370c0ba8f03b00ee4b774d7becf;hp=5c590e405e51086f762e0c5c45d397b8409004be;hb=b10167d55798ea184f97fafda075255c0852f3b6;hpb=82307651be6db411532b317a5ebc6edd933eea8d

diff --git a/macro.c b/macro.c
index 5c590e4..6e9fd86 100644
--- a/macro.c
+++ b/macro.c
@@ -333,7 +333,7 @@ int lncatch(int (* lnfunc)(), char * dirlist)
 
 	for(;;)
 	{
-		if (tokln() == TKEOF)
+		if (TokenizeLine() == TKEOF)
 		{
 			errors("encountered end-of-file looking for '%s'", dirlist);
 			fatal("cannot continue");
@@ -350,19 +350,11 @@ int lncatch(int (* lnfunc)(), char * dirlist)
 			if ((tok[2] == ':' || tok[2] == DCOLON))
 			{
 				if (tok[3] == SYMBOL)			// label: symbol
-#if 0
-					p = (char *)tok[4];
-#else
 					p = string[tok[4]];
-#endif
 			}
 			else
 			{
-#if 0
-				p = (char *)tok[1];				// symbol 
-#else
 				p = string[tok[1]];				// Symbol
-#endif
 			}
 		}