z80/z180: allow both to co-exist in one binary

EtchedPixels · Mar 18, 2024 · 4da31b7 · 4da31b7
1 parent c76d6ab
commit 4da31b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/libz180/z180.c b/libz180/z180.c
@@ -462,7 +462,7 @@ static void doBIT_indexed(Z180Context* ctx, int b, ushort address)
 }
 
 
-byte doSetRes (Z180Context* ctx, int bit, int pos, byte val)
+static byte doSetRes (Z180Context* ctx, int bit, int pos, byte val)
 {
     if (bit)
 		val |= (1 << pos);

diff --git a/libz180/z180.h b/libz180/z180.h
@@ -59,6 +59,8 @@ typedef union
 	} br;
 } Z180Regs;
 
+#ifndef Z80FLAGS_ENUM
+#define Z80FLAGS_ENUM
 
 /** The Z180 flags */
 typedef enum
@@ -72,6 +74,7 @@ typedef enum
 	F_Z  =  64, /**< Zero */
 	F_S  = 128  /**< Sign */
 } Z180Flags;
+#endif
 
 
 /** A Z180 execution context. */

diff --git a/libz80/z80.c b/libz80/z80.c
@@ -457,7 +457,7 @@ static void doBIT_indexed(Z80Context* ctx, int b, ushort address)
 }
 
 
-byte doSetRes (Z80Context* ctx, int bit, int pos, byte val)
+static byte doSetRes (Z80Context* ctx, int bit, int pos, byte val)
 {
     if (bit)
 		val |= (1 << pos);

diff --git a/libz80/z80.h b/libz80/z80.h
@@ -60,6 +60,9 @@ typedef union
 } Z80Regs;
 
 
+#ifndef Z80FLAGS_ENUM
+#define Z80FLAGS_ENUM
+
 /** The Z80 flags */
 typedef enum
 {
@@ -72,7 +75,7 @@ typedef enum
 	F_Z  =  64, /**< Zero */
 	F_S  = 128  /**< Sign */
 } Z80Flags;
-
+#endif
 
 /** A Z80 execution context. */
 typedef struct