From cf185123ebc350b0b6983883a89550e11dfee4c7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 16 Aug 2016 08:45:20 +0200 Subject: [PATCH] Reduce ifdef to what's necessary --- desmume/src/armcpu.h | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h index 9e7fcddd7..d55e1c5ef 100644 --- a/desmume/src/armcpu.h +++ b/desmume/src/armcpu.h @@ -179,11 +179,11 @@ enum Mode SYS = 0x1F }; -#ifdef MSB_FIRST typedef union { struct { +#ifdef MSB_FIRST u32 N : 1, Z : 1, C : 1, @@ -193,16 +193,9 @@ typedef union I : 1, F : 1, T : 1, - mode : 5; - } bits; - u32 val; -} Status_Reg; + mode : 5; #else -typedef union -{ - struct - { - u32 mode : 5, + u32 mode : 5, T : 1, F : 1, I : 1, @@ -212,10 +205,10 @@ typedef union C : 1, Z : 1, N : 1; - } bits; - u32 val; -} Status_Reg; #endif + } bits; + u32 val; +} Status_Reg; /** * The control interface to a CPU