diff options
author | Mike Pavone <pavone@retrodev.com> | 2020-07-11 21:16:32 -0700 |
---|---|---|
committer | Mike Pavone <pavone@retrodev.com> | 2020-07-11 21:16:32 -0700 |
commit | fcf2f4d291b9af0daa49620fad8ea8efad901f15 (patch) | |
tree | 7395602342e7c91219da8cd552cac9fc5e4bff23 | |
parent | df59cb9fd552d7ef2ff6c3de9c37fcbdfc96ab3d (diff) |
Fix broken enum definitions that cause multiple definition errors when building with -fno-common which is now the default in GCC 10
-rw-r--r-- | gen_x86.c | 2 | ||||
-rw-r--r-- | gen_x86.h | 8 | ||||
-rw-r--r-- | vdp.h | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -130,7 +130,7 @@ enum { X86_R13, X86_R14, X86_R15 -} x86_regs_enc; +}; char * x86_reg_names[] = { #ifdef X86_64 @@ -30,7 +30,7 @@ enum { R13, R14, R15 -} x86_regs; +}; enum { CC_O = 0, @@ -51,14 +51,14 @@ enum { CC_GE, CC_LE, CC_G -} x86_cc; +}; enum { SZ_B = 0, SZ_W, SZ_D, SZ_Q -} x86_size; +}; #ifdef X86_64 #define SZ_PTR SZ_Q @@ -85,7 +85,7 @@ enum { MODE_REG_DIRECT = 0xC0, //"phony" mode MODE_IMMED = 0xFF -} x86_modes; +}; void rol_ir(code_info *code, uint8_t val, uint8_t dst, uint8_t size); void ror_ir(code_info *code, uint8_t val, uint8_t dst, uint8_t size); @@ -92,7 +92,7 @@ enum { REG_DMASRC_L, REG_DMASRC_M, REG_DMASRC_H -} vdp_regs; +}; //Mode reg 1 #define BIT_VSCRL_LOCK 0x80 |