X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=macro.c;h=0807e74b033f38080fd0ceb2ad4b21bcf3c00f4a;hp=4232f1af60e53d323e20ebb242e0c23c02529f59;hb=ae7127773aa49608da898bb9f9a0e5f87a3c1816;hpb=c74d8ef6f193cb2be876c920c5cb7f599dd5418a

diff --git a/macro.c b/macro.c
index 4232f1a..0807e74 100644
--- a/macro.c
+++ b/macro.c
@@ -40,7 +40,6 @@ void InitMacro(void)
 {
 	macuniq = 0;
 	macnum = 1;
-//	argp = NULL;
 	argp = 0;
 }
 
@@ -53,11 +52,7 @@ void InitMacro(void)
 //
 int ExitMacro(void)
 {
-#ifndef _MSC_VER
-#pragma message !!! Bad macro exiting !!!
-#else
-#pragma WARNING(!!! Bad macro exiting !!!)
-#endif
+WARNING(!!! Bad macro exiting !!!)
 
 /*
 This is a problem. Currently, the argument logic just keeps the current
@@ -85,8 +80,7 @@ of another (nested macros). Need to fix that somehow.
 	argp -= imacro->im_nargs;
 	DEBUG printf("%d (nargs = %d)\n", argp, imacro->im_nargs);
 
-	fpop();
-	return 0;
+	return fpop();
 }
 
 
@@ -253,11 +247,7 @@ int defr1(char * ln, int kwno)
 		rptlevel++;
 	default:
 //MORE stupidity here...
-#ifndef _MSC_VER
-#pragma warning "!!! Casting (char *) as LONG !!!"
-#else
-#pragma WARNING(!!! Casting (char *) as LONG !!!)
-#endif
+WARNING(!!! Casting (char *) as LONG !!!)
 	addln:
 		// Allocate length of line + 1('\0') + LONG
 		len = strlen(ln) + 1 + sizeof(LONG);