X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=0519dc2f71bdedfc3d7b56d9ffcf281917728487;hp=bba14d71b29bda02c06117f8e2831d10fe010877;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4;ds=sidebyside

diff --git a/rmac.h b/rmac.h
index bba14d7..0519dc2 100644
--- a/rmac.h
+++ b/rmac.h
@@ -177,24 +177,18 @@ XEX, 				// COM/EXE/XEX/whatever a8 object format
 // Assembler token
 #define TOKEN	uint32_t
 
-// Token pointer type is a union because we have 64-bit sized tokens now :-P
-#define TOKENPTR union _tokenptr
-TOKENPTR
-{
-	uint32_t * u32;
-	uint64_t * u64;
-};
-
 // Pointer type that can point to (almost) anything
 #define PTR union _ptr
 PTR
 {
-	uint8_t *  cp;				// Char
-	uint16_t * wp;				// WORD
-	uint32_t * lp;				// LONG
-	uint32_t   lw;				// LONG
-	SYM **     sy;				// SYM
-	TOKENPTR   tk;				// TOKEN
+	uint8_t *  cp;				// Char pointer
+	uint16_t * wp;				// WORD pointer
+	uint32_t * lp;				// LONG pointer
+	uint32_t * u32;				// 32-bit pointer
+	uint64_t * u64;				// 64-bit pointer
+	uint32_t   lw;				// LONG (for some reason)
+	SYM **     sy;				// SYM pointer
+	TOKEN *    tk;				// TOKEN pointer
 };
 
 // Symbol spaces