Move the output format macros into the macros.pl mechanism

Move the handling of "extra" macros (i.e. output format macros) into
the macros.pl mechanism.  This allows us to change the format of the
internal macro store in the future - e.g. to a single byte store
without redundant pointers.

Also, stop using indicies into a long array when there is no good
reason to not just use different arrays.

1 files changed, 2 insertions, 1 deletions

diff --git a/nasm.h b/nasm.h
index ec44f164..203750e5 100644
--- a/nasm.h
+++ b/nasm.h
@@ -17,6 +17,7 @@
 #include <inttypes.h>
 #include "version.h"            /* generated NASM version macros */
 #include "nasmlib.h"
+#include "preproc.h"
 #include "insnsi.h"		/* For enum opcode */
 
 #define NO_SEG -1L              /* null segment value */
@@ -750,7 +751,7 @@ struct ofmt {
      * and user-level equivalents for any format-specific
      * directives).
      */
-    const char **stdmac;
+    const macros_t *stdmac;
 
     /*
      * This procedure is called at the start of an output session.