Fixed .cargs problem, more code cleanup/fixup

[rmac] / rmac.h

diff --git a/rmac.h b/rmac.h
index f660a0d788295c711d39bbebcd6e240dbd30692b..7d8b526970a3136085f046e0e31974f47ad7ab66 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -12,7 +12,6 @@
 //
 // TARGET SPECIFIC BUILD SETTINGS
 //
-
 #ifdef WIN32
        #define PLATFORM        "Win32"                 // Release platform - windows
        #define _OPEN_FLAGS     _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR
@@ -60,7 +59,11 @@
        #endif
 #endif
 
+//
+// Non-target specific stuff
+//
 #include <inttypes.h>
+#include "symbol.h"
 
 #define BYTE         uint8_t
 #define WORD         uint16_t
@@ -113,21 +116,6 @@
 #define MWC          1                         // Mark Williams object format
 #define BSD          2                         // BSD object format
 
-// Symbols
-#define  SYM         struct _sym
-SYM
-{
-   SYM * snext;                                                // * -> Next symbol on hash-chain
-   SYM * sorder;                                       // * -> Next sym in order of refrence
-   SYM * sdecl;                                                // * -> Next sym in order of declaration
-   BYTE stype;                                         // Symbol type 
-   WORD sattr;                                         // Attribute bits
-   LONG sattre;                                                // Extended attribute bits
-   WORD senv;                                          // Enviroment number
-   LONG svalue;                                                // Symbol value
-   char * sname;                                       // * -> Symbol's print-name
-};
-
 // Pointer type that can point to (almost) anything
 #define PTR union _ptr
 PTR
@@ -195,7 +183,6 @@ extern int lsym_flag;
 extern int sbra_flag;
 extern int obj_format;
 extern LONG amemtot;
-extern int in_main;
 
 // Prototypes
 void init_sym(void);
@@ -208,6 +195,5 @@ int nthpath(char *, int, char *);
 void clear(char *, LONG);
 char * copy(char *, char *, LONG);
 int rmac_qsort(char *, int, int, int (*)());
-//char * amem(LONG);
 
 #endif // __RMAC_H__