--- uae/src/picasso96.c	2018/04/24 16:47:26	1.1.1.6
+++ uae/src/picasso96.c	2018/04/24 16:48:43	1.1.1.7
@@ -559,7 +559,7 @@ static void wgfx_do_flushline (void)
     wgfx_linestart = 0xFFFFFFFF;
 }
 
-static __inline__ void wgfx_flushline (void)
+STATIC_INLINE void wgfx_flushline (void)
 {
     if (wgfx_linestart == 0xFFFFFFFF || ! picasso_on)
 	return;
@@ -1353,30 +1353,30 @@ uae_u32 picasso_BlitRectNoMaskComplete (
 }
 
 /* This utility function is used both by BlitTemplate() and BlitPattern() */
-static __inline__ void PixelWrite1(uae_u8 *mem, int bits, uae_u32 fgpen, uae_u32 mask)
+STATIC_INLINE void PixelWrite1(uae_u8 *mem, int bits, uae_u32 fgpen, uae_u32 mask)
 {
     if (mask != 0xFF)
 	fgpen = (fgpen & mask) | (do_get_mem_byte (mem + bits) & ~mask);
     do_put_mem_byte (mem + bits, fgpen);
 }
 
-static __inline__ void PixelWrite2(uae_u8 *mem, int bits, uae_u32 fgpen)
+STATIC_INLINE void PixelWrite2(uae_u8 *mem, int bits, uae_u32 fgpen)
 {
     do_put_mem_word (((uae_u16 *)mem) + bits, fgpen);
 }
 
-static __inline__ void PixelWrite3(uae_u8 *mem, int bits, uae_u32 fgpen)
+STATIC_INLINE void PixelWrite3(uae_u8 *mem, int bits, uae_u32 fgpen)
 {
     do_put_mem_byte (mem + bits*3, fgpen & 0x000000FF);
     *(uae_u16 *)(mem + bits*3+1) = (fgpen & 0x00FFFF00) >> 8;
 }
 
-static __inline__ void PixelWrite4(uae_u8 *mem, int bits, uae_u32 fgpen)
+STATIC_INLINE void PixelWrite4(uae_u8 *mem, int bits, uae_u32 fgpen)
 {
     do_put_mem_long (((uae_u32 *)mem) + bits, fgpen);
 }
 
-static __inline__ void PixelWrite(uae_u8 *mem, int bits, uae_u32 fgpen, uae_u8 Bpp, uae_u32 mask)
+STATIC_INLINE void PixelWrite(uae_u8 *mem, int bits, uae_u32 fgpen, uae_u8 Bpp, uae_u32 mask)
 {
     switch (Bpp) {
     case 1: