X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;h=c78d97ac6f0054d8ca02bf68b0a3a1c0c10406e4;hp=1cd9ebadc5df82706d94a683cdc5e02570fc5d24;hb=d9c1d993917d9f0101747e137709fe2ba9854b7f;hpb=c74d8ef6f193cb2be876c920c5cb7f599dd5418a

diff --git a/token.c b/token.c
index 1cd9eba..c78d97a 100644
--- a/token.c
+++ b/token.c
@@ -728,7 +728,10 @@ int fpop(void)
 		// Pop IFENT levels until we reach the conditional assembly context we
 		// were at when the input object was entered.
 		while (ifent != inobj->in_ifent)
-			d_endif();
+		{
+			if (d_endif() != 0)				// Something bad happened during endif parsing?
+				return -1;					// If yes, bail instead of getting stuck in a loop
+		}
 
 		tok = inobj->in_otok;				// Restore tok and otok
 		etok = inobj->in_etok;
@@ -940,8 +943,10 @@ if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n");
 	case SRC_IMACRO:
 		if ((ln = GetNextMacroLine()) == NULL)
 		{
-			ExitMacro();					// Exit macro (pop args, do fpop(), etc)
-			goto retry;						// Try for more lines...
+			if (ExitMacro() == 0)			// Exit macro (pop args, do fpop(), etc)
+				goto retry;					// Try for more lines...
+			else
+				return TKEOF;				// Oops, we got a non zero return code, signal EOF
 		}
 
 		lntag = '@';
@@ -1547,11 +1552,7 @@ int d_goto(WORD unused)
 			// Compare names (sleazo string compare)
 			// This string compare is not right. Doesn't check for lengths.
 			// (actually it does, but in a crappy, unclear way.)
-#ifndef _MSC_VER
-			#warning "!!! Bad string comparison !!!"
-#else
-			#pragma WARNING(!!!! Bad string comparison !!!)
-#endif
+WARNING(!!!! Bad string comparison !!!)
 			s1 = sym;
 //			s2 = (char *)(defln + 1) + 1;
 			s2 = defln->line;