--- uae/src/include/newcpu.h	2018/04/24 16:46:28	1.1.1.6
+++ uae/src/include/newcpu.h	2018/04/24 16:50:23	1.1.1.8
@@ -27,7 +27,7 @@
  SET_ZFLG (0); \
  SET_NFLG (0); \
  SET_VFLG (0); \
-while (0)
+} while (0)
 
 #define COPY_CARRY (SET_XFLG (GET_CFLG))
 #endif
@@ -97,27 +97,21 @@ extern struct regstruct
 #define get_iword(o) do_get_mem_word((uae_u16 *)(regs.pc_p + (o)))
 #define get_ilong(o) do_get_mem_long((uae_u32 *)(regs.pc_p + (o)))
 
-#ifdef HAVE_GET_WORD_UNSWAPPED
-#define GET_OPCODE (do_get_mem_word_unswapped (regs.pc_p))
-#else
-#define GET_OPCODE (get_iword (0))
-#endif
-
-static __inline__ uae_u32 get_ibyte_prefetch (uae_s32 o)
+STATIC_INLINE uae_u32 get_ibyte_prefetch (uae_s32 o)
 {
     if (o > 3 || o < 0)
 	return do_get_mem_byte((uae_u8 *)(regs.pc_p + o + 1));
 
     return do_get_mem_byte((uae_u8 *)(((uae_u8 *)&regs.prefetch) + o + 1));
 }
-static __inline__ uae_u32 get_iword_prefetch (uae_s32 o)
+STATIC_INLINE uae_u32 get_iword_prefetch (uae_s32 o)
 {
     if (o > 3 || o < 0)
 	return do_get_mem_word((uae_u16 *)(regs.pc_p + o));
 
     return do_get_mem_word((uae_u16 *)(((uae_u8 *)&regs.prefetch) + o));
 }
-static __inline__ uae_u32 get_ilong_prefetch (uae_s32 o)
+STATIC_INLINE uae_u32 get_ilong_prefetch (uae_s32 o)
 {
     if (o > 3 || o < 0)
 	return do_get_mem_long((uae_u32 *)(regs.pc_p + o));
@@ -128,7 +122,7 @@ static __inline__ uae_u32 get_ilong_pref
 
 #define m68k_incpc(o) (regs.pc_p += (o))
 
-static __inline__ void fill_prefetch_0 (void)
+STATIC_INLINE void fill_prefetch_0 (void)
 {
     uae_u32 r;
 #ifdef UNALIGNED_PROFITABLE
@@ -141,7 +135,7 @@ static __inline__ void fill_prefetch_0 (
 }
 
 #if 0
-static __inline__ void fill_prefetch_2 (void)
+STATIC_INLINE void fill_prefetch_2 (void)
 {
     uae_u32 r = do_get_mem_long (&regs.prefetch) << 16;
     uae_u32 r2 = do_get_mem_word (((uae_u16 *)regs.pc_p) + 1);
@@ -154,21 +148,21 @@ static __inline__ void fill_prefetch_2 (
 
 /* These are only used by the 68020/68881 code, and therefore don't
  * need to handle prefetch.  */
-static __inline__ uae_u32 next_ibyte (void)
+STATIC_INLINE uae_u32 next_ibyte (void)
 {
     uae_u32 r = get_ibyte (0);
     m68k_incpc (2);
     return r;
 }
 
-static __inline__ uae_u32 next_iword (void)
+STATIC_INLINE uae_u32 next_iword (void)
 {
     uae_u32 r = get_iword (0);
     m68k_incpc (2);
     return r;
 }
 
-static __inline__ uae_u32 next_ilong (void)
+STATIC_INLINE uae_u32 next_ilong (void)
 {
     uae_u32 r = get_ilong (0);
     m68k_incpc (4);
@@ -176,7 +170,7 @@ static __inline__ uae_u32 next_ilong (vo
 }
 
 #if !defined USE_COMPILER
-static __inline__ void m68k_setpc (uaecptr newpc)
+STATIC_INLINE void m68k_setpc (uaecptr newpc)
 {
     regs.pc_p = regs.pc_oldp = get_real_address(newpc);
     regs.pc = newpc;
@@ -185,12 +179,12 @@ static __inline__ void m68k_setpc (uaecp
 extern void m68k_setpc (uaecptr newpc);
 #endif
 
-static __inline__ uaecptr m68k_getpc (void)
+STATIC_INLINE uaecptr m68k_getpc (void)
 {
     return regs.pc + ((char *)regs.pc_p - (char *)regs.pc_oldp);
 }
 
-static __inline__ uaecptr m68k_getpc_p (uae_u8 *p)
+STATIC_INLINE uaecptr m68k_getpc_p (uae_u8 *p)
 {
     return regs.pc + ((char *)p - (char *)regs.pc_oldp);
 }
@@ -205,7 +199,7 @@ extern void m68k_setpc_rte (uaecptr newp
 #define m68k_setpc_rte  m68k_setpc
 #endif
 
-static __inline__ void m68k_setstopped (int stop)
+STATIC_INLINE void m68k_setstopped (int stop)
 {
     regs.stopped = stop;
     if (stop)
@@ -221,8 +215,8 @@ extern void MakeSR (void);
 extern void MakeFromSR (void);
 extern void Exception (int, uaecptr);
 extern void dump_counts (void);
-extern void m68k_move2c (int, uae_u32 *);
-extern void m68k_movec2 (int, uae_u32 *);
+extern int m68k_move2c (int, uae_u32 *);
+extern int m68k_movec2 (int, uae_u32 *);
 extern void m68k_divl (uae_u32, uae_u32, uae_u16, uaecptr);
 extern void m68k_mull (uae_u32, uae_u32, uae_u16);
 extern void init_m68k (void);