diff --git a/cpu/cz80/cz80.c b/cpu/cz80/cz80.c index 461b46a7..d7bdba3b 100644 --- a/cpu/cz80/cz80.c +++ b/cpu/cz80/cz80.c @@ -14,12 +14,20 @@ #include "cz80.h" #if PICODRIVE_HACKS +#undef EMU_M68K #include #endif #ifndef ALIGN_DATA +#ifdef _MSC_VER +#define ALIGN_DATA +#define inline +#undef CZ80_USE_JUMPTABLE +#define CZ80_USE_JUMPTABLE 0 +#else #define ALIGN_DATA __attribute__((aligned(4))) #endif +#endif #define CF 0x01 #define NF 0x02 diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c index 0bb0f9ba..19657fc6 100644 --- a/cpu/fame/famec.c +++ b/cpu/fame/famec.c @@ -33,7 +33,9 @@ #undef INLINE -#ifndef INLINE +#ifdef _MSC_VER +#define INLINE +#else #define INLINE __inline__ #endif @@ -914,9 +916,10 @@ famec_Exec: #endif if (cycles_needed != 0) { + u32 line; m68kcontext.io_cycle_counter = cycles_needed; cycles_needed = 0; - s32 line=interrupt_chk__(); + line=interrupt_chk__(); if (line>0) { if (m68kcontext.iack_handler != NULL)