--- uae/src/blitter.c	2018/04/24 16:40:08	1.1.1.3
+++ uae/src/blitter.c	2018/04/24 16:48:49	1.1.1.5
@@ -11,8 +11,6 @@
 
 #include "config.h"
 #include "options.h"
-#include "gensound.h"
-#include "sounddep/sound.h"
 #include "events.h"
 #include "uae.h"
 #include "memory.h"
@@ -68,13 +66,13 @@ void build_blitfilltable(void)
     }
 }
 
-static __inline__ uae_u8 *blit_xlateptr(uaecptr bltpt, int bytecount)
+STATIC_INLINE uae_u8 *blit_xlateptr(uaecptr bltpt, int bytecount)
 {
     if (!chipmem_bank.check(bltpt,bytecount)) return NULL;
     return chipmem_bank.xlateaddr(bltpt);
 }
 
-static __inline__ uae_u8 *blit_xlateptr_desc(uaecptr bltpt, int bytecount)
+STATIC_INLINE uae_u8 *blit_xlateptr_desc(uaecptr bltpt, int bytecount)
 {
     if (!chipmem_bank.check(bltpt-bytecount, bytecount)) return NULL;
     return chipmem_bank.xlateaddr(bltpt);
@@ -246,7 +244,7 @@ static void blitter_dofast_desc(void)
     bltstate = BLT_done;
 }
 
-static __inline__ int blitter_read(void)
+STATIC_INLINE int blitter_read(void)
 {
     if (bltcon0 & 0xe00){
 	if (!dmaen(DMA_BLITTER)) return 1; /* blitter stopped */
@@ -256,7 +254,7 @@ static __inline__ int blitter_read(void)
     return (bltcon0 & 0xE00) != 0;
 }
 
-static __inline__ int blitter_write(void)
+STATIC_INLINE int blitter_write(void)
 {
     if (blt_info.bltddat) blt_info.blitzero = 0;
     if ((bltcon0 & 0x100) || blitline){
@@ -267,7 +265,7 @@ static __inline__ int blitter_write(void
     return (bltcon0 & 0x100) != 0;
 }
 
-static __inline__ void blitter_line_incx(void)
+STATIC_INLINE void blitter_line_incx(void)
 {
     if (++blinea_shift == 16) {
 	blinea_shift = 0;
@@ -276,7 +274,7 @@ static __inline__ void blitter_line_incx
     }
 }
 
-static __inline__ void blitter_line_decx(void)
+STATIC_INLINE void blitter_line_decx(void)
 {
     if (blinea_shift-- == 0) {
 	blinea_shift = 15;
@@ -285,14 +283,14 @@ static __inline__ void blitter_line_decx
     }
 }
 
-static __inline__ void blitter_line_decy(void)
+STATIC_INLINE void blitter_line_decy(void)
 {
     bltcnxlpt -= blt_info.bltcmod;
     bltdnxlpt -= blt_info.bltcmod; /* ??? am I wrong or doesn't KS1.3 set bltdmod? */
     blitonedot = 0;
 }
 
-static __inline__ void blitter_line_incy(void)
+STATIC_INLINE void blitter_line_incy(void)
 {
     bltcnxlpt += blt_info.bltcmod;
     bltdnxlpt += blt_info.bltcmod; /* ??? */
@@ -338,7 +336,7 @@ static void blitter_line(void)
     bltstate = BLT_write;
 }
 
-static __inline__ void blitter_nxline(void)
+STATIC_INLINE void blitter_nxline(void)
 {
     bltcpt = bltcnxlpt;
     bltdpt = bltdnxlpt;
@@ -361,10 +359,9 @@ static void blit_init(void)
     blt_info.blitdownbshift = 16 - blt_info.blitbshift;
 
     if (blitline) {
-	if (blt_info.hblitsize != 2) {
-	    sprintf (warning_buffer, "weird hblitsize in linemode: %d\n", blt_info.hblitsize);
-	    write_log (warning_buffer);
-	}
+	if (blt_info.hblitsize != 2)
+	    write_log ("weird hblitsize in linemode: %d\n", blt_info.hblitsize);
+
 	bltcnxlpt = bltcpt;
 	bltdnxlpt = bltdpt;
 	blitsing = bltcon1 & 0x2;