Fixed subtle bug in expr().

[rmac] / macro.h

diff --git a/macro.h b/macro.h
index bd4f14729be81e10c3db9742187105c1eecc48a1..9b45c5b0662b3d0d4e78df2eaac420e061a7f552 100644 (file)
--- a/macro.h
+++ b/macro.h
@@ -1,9 +1,10 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
+//
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // MACRO.H - Macro Definition and Invocation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source Utilised with the Kind Permission of Landon Dyer
+//
 
 #ifndef __MACRO_H__
 #define __MACRO_H__
@@ -12,18 +13,17 @@
 
 // Globals, externals etc
 extern LONG curuniq;
-extern TOKEN **argp;
-extern int mjump_align;
+//extern TOKEN ** argp;
+//extern int mjump_align;
+extern TOKEN * argPtrs[];
 
 // Prototypes
-void init_macro(void);
-int exitmac(void);
-int defmac(void);
+void InitMacro(void);
+int ExitMacro(void);
+int DefineMacro(void);
 int defrept(void);
 int lncatch(int (*)(), char *);
 int kwmatch(char *, char *);
-int invokemac(SYM *, WORD);
-void ib_macro(void);
+int InvokeMacro(SYM *, WORD);
 
 #endif // __MACRO_H__
-