diff --git a/src/emu/cpu/h6280/h6280ops.h b/src/emu/cpu/h6280/h6280ops.h index 8994af578ba..9969907a268 100644 --- a/src/emu/cpu/h6280/h6280ops.h +++ b/src/emu/cpu/h6280/h6280ops.h @@ -1080,6 +1080,9 @@ INLINE void WRMEM(offs_t addr, UINT8 data) { /* 6280 ******************************************************** * SEC Set carry flag ***************************************************************/ +#if defined(SEC) +#undef SEC +#endif #define SEC \ CLEAR_T; \ P |= _fC diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c index b8d9c4237d1..fc2812f8e8f 100644 --- a/src/emu/cpu/hd6309/hd6309.c +++ b/src/emu/cpu/hd6309/hd6309.c @@ -297,6 +297,9 @@ static UINT8 const *index_cycle; #define EXTENDED IMMWORD(ea) /* macros to set status flags */ +#if defined(SEC) +#undef SEC +#endif #define SEC CC|=CC_C #define CLC CC&=~CC_C #define SEZ CC|=CC_Z diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c index 7642ac07152..1cc2a0c06fb 100644 --- a/src/emu/cpu/konami/konami.c +++ b/src/emu/cpu/konami/konami.c @@ -262,6 +262,9 @@ CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N #define EXTENDED IMMWORD(ea) /* macros to set status flags */ +#if defined(SEC) +#undef SEC +#endif #define SEC CC|=CC_C #define CLC CC&=~CC_C #define SEZ CC|=CC_Z diff --git a/src/emu/cpu/lh5801/5801dasm.c b/src/emu/cpu/lh5801/5801dasm.c index 8771f43925f..7295417f6c6 100644 --- a/src/emu/cpu/lh5801/5801dasm.c +++ b/src/emu/cpu/lh5801/5801dasm.c @@ -58,6 +58,10 @@ static const char *const RegNames[]= { 0, "A", "XL", "XH", "X", "YL", "YH", "Y", "UL", "UH", "U", "P", "S" }; +#if defined(SEC) +#undef SEC +#endif + typedef enum { ILL, ILL2, PREFD, NOP, diff --git a/src/emu/cpu/m6502/ops02.h b/src/emu/cpu/m6502/ops02.h index 09bcf866e0f..39dad716b8c 100644 --- a/src/emu/cpu/m6502/ops02.h +++ b/src/emu/cpu/m6502/ops02.h @@ -728,6 +728,9 @@ /* 6502 ******************************************************** * SEC Set carry flag ***************************************************************/ +#if defined(SEC) +#undef SEC +#endif #define SEC \ P |= F_C diff --git a/src/emu/cpu/m6502/opsce02.h b/src/emu/cpu/m6502/opsce02.h index 0974a4fbbbf..29690d2b0d8 100644 --- a/src/emu/cpu/m6502/opsce02.h +++ b/src/emu/cpu/m6502/opsce02.h @@ -832,6 +832,9 @@ /* 65ce02 ****************************************************** * SEC Set carry flag ***************************************************************/ +#if defined(SEC) +#undef SEC +#endif #define SEC \ P |= F_C diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index 2eaf4ce1579..f70f0781a93 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -367,6 +367,9 @@ static const UINT8 flags8d[256]= /* decrement */ #define INDEXED {EA=X+(UINT8)M_RDOP_ARG(PCD);PC++;} /* macros to set status flags */ +#if defined(SEC) +#undef SEC +#endif #define SEC CC|=0x01 #define CLC CC&=0xfe #define SEZ CC|=0x04 diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c index 0a69b51e288..f928d7f557e 100644 --- a/src/emu/cpu/m6805/m6805.c +++ b/src/emu/cpu/m6805/m6805.c @@ -178,6 +178,9 @@ static const UINT8 flags8d[256]= /* decrement */ #define INDEXED2 {IMMWORD(ea); EA+=X;} /* macros to set status flags */ +#if defined(SEC) +#undef SEC +#endif #define SEC CC|=CFLAG #define CLC CC&=~CFLAG #define SEZ CC|=ZFLAG diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index 0024874b0ba..4dfc0f4f2e7 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -309,6 +309,9 @@ CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N #define EXTENDED IMMWORD(ea) /* macros to set status flags */ +#if defined(SEC) +#undef SEC +#endif #define SEC CC|=CC_C #define CLC CC&=~CC_C #define SEZ CC|=CC_Z diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c index 44eda28c690..3b70ab7cb56 100644 --- a/src/mame/video/model2.c +++ b/src/mame/video/model2.c @@ -144,7 +144,7 @@ typedef struct UINT16 z; UINT16 texheader[4]; UINT8 luma; -} quad; +} _quad; typedef struct _poly_extra_data poly_extra_data; struct _poly_extra_data @@ -368,7 +368,7 @@ void model2_3d_set_zclip( UINT8 clip ) static void model2_3d_process_quad( UINT32 attr ) { - quad object; + _quad object; UINT16 *th, *tp; INT32 tho; UINT32 cull, i;