1 files changed, 7 insertions, 9 deletions
diff --git a/src/65c816.h b/src/65c816.h
index 55c1dc2..0f265b9 100644
--- a/src/65c816.h
+++ b/src/65c816.h
@@ -44,6 +44,7 @@
 #ifndef _65c816_h_
 #define _65c816_h_
 
+#include <stdint.h>
 #include "port.h"
 
 #define AL A.B.l
@@ -102,19 +103,17 @@
 
 typedef union
 {
-#ifdef MSB_FIRST
    struct
    {
+#ifdef MSB_FIRST
       uint8 h, l;
-   } PACKING B;
 #else
-   struct
-   {
       uint8 l, h;
-   } PACKING B;
 #endif
-   uint16 W;
-} ALIGN_BY_ONE pair;
+   } B;
+
+   uint16_t W;
+} pair;
 
 typedef struct
 {
@@ -127,9 +126,8 @@ typedef struct
    pair   S;
    pair   Y;
    uint16 PC;
-} PACKING SRegisters;
+} SRegisters;
 
 #define Registers CPU.Regs
-//EXTERN_C struct SRegisters Registers;
 
 #endif