X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=macro.c;h=0807e74b033f38080fd0ceb2ad4b21bcf3c00f4a;hp=5aaa842a52d78d75c4808d676b384a54d5e1d914;hb=8b1dd903c42afb254e1bffcb42dff44c6e8ab43d;hpb=d0c28c349ddfb8393568037f68bddbe8979ce0df

diff --git a/macro.c b/macro.c
index 5aaa842..0807e74 100644
--- a/macro.c
+++ b/macro.c
@@ -40,7 +40,6 @@ void InitMacro(void)
 {
 	macuniq = 0;
 	macnum = 1;
-//	argp = NULL;
 	argp = 0;
 }
 
@@ -53,7 +52,8 @@ void InitMacro(void)
 //
 int ExitMacro(void)
 {
-#warning !!! Bad macro exiting !!!
+WARNING(!!! Bad macro exiting !!!)
+
 /*
 This is a problem. Currently, the argument logic just keeps the current
 arguments and doesn't save anything if a new macro is called in the middle
@@ -80,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();
 }
 
 
@@ -110,8 +109,8 @@ int defmac2(char * argname)
 //
 int defmac1(char * ln, int notEndFlag)
 {
-	PTR p;
-	LONG len;
+//	PTR p;
+//	LONG len;
 
 	if (list_flag)
 	{
@@ -248,7 +247,7 @@ int defr1(char * ln, int kwno)
 		rptlevel++;
 	default:
 //MORE stupidity here...
-#warning "!!! Casting (char *) as LONG !!!"
+WARNING(!!! Casting (char *) as LONG !!!)
 	addln:
 		// Allocate length of line + 1('\0') + LONG
 		len = strlen(ln) + 1 + sizeof(LONG);
@@ -448,7 +447,7 @@ int InvokeMacro(SYM * mac, WORD siz)
 	TOKEN * dest;
 	int stringNum = 0;
 	int argumentNum = 0;
-	int i;
+//	int i;
 
 	for(dry_run=1; ; dry_run--)
 	{