From fcf2f4d291b9af0daa49620fad8ea8efad901f15 Mon Sep 17 00:00:00 2001 From: Mike Pavone Date: Sat, 11 Jul 2020 21:16:32 -0700 Subject: Fix broken enum definitions that cause multiple definition errors when building with -fno-common which is now the default in GCC 10 --- gen_x86.c | 2 +- gen_x86.h | 8 ++++---- vdp.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gen_x86.c b/gen_x86.c index 3737461..a540357 100644 --- a/gen_x86.c +++ b/gen_x86.c @@ -130,7 +130,7 @@ enum { X86_R13, X86_R14, X86_R15 -} x86_regs_enc; +}; char * x86_reg_names[] = { #ifdef X86_64 diff --git a/gen_x86.h b/gen_x86.h index 6ff0da9..5745850 100644 --- a/gen_x86.h +++ b/gen_x86.h @@ -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); diff --git a/vdp.h b/vdp.h index 28a132e..b58aca5 100644 --- a/vdp.h +++ b/vdp.h @@ -92,7 +92,7 @@ enum { REG_DMASRC_L, REG_DMASRC_M, REG_DMASRC_H -} vdp_regs; +}; //Mode reg 1 #define BIT_VSCRL_LOCK 0x80 -- cgit v1.2.3