Fixes for compilation against GCC 6.

[virtualjaguar] / src / blitter.h

diff --git a/src/blitter.h b/src/blitter.h
index 535f7cb77fd5e2d4c9b9ad0ae418ec8b201d0522..d57e866f984f13863dd04e07a0b0a283dfecb3f4 100644 (file)
--- a/src/blitter.h
+++ b/src/blitter.h
@@ -5,23 +5,24 @@
 #ifndef __BLITTER_H__
 #define __BLITTER_H__
 
-#include "types.h"
+//#include "types.h"
+#include "memory.h"
 
 void BlitterInit(void);
 void BlitterReset(void);
 void BlitterDone(void);
 
-uint8 BlitterReadByte(uint32, uint32 who = UNKNOWN);
-uint16 BlitterReadWord(uint32, uint32 who = UNKNOWN);
-uint32 BlitterReadLong(uint32, uint32 who = UNKNOWN);
-void BlitterWriteByte(uint32, uint8, uint32 who = UNKNOWN);
-void BlitterWriteWord(uint32, uint16, uint32 who = UNKNOWN);
-void BlitterWriteLong(uint32, uint32, uint32 who = UNKNOWN);
+uint8_t BlitterReadByte(uint32_t, uint32_t who = UNKNOWN);
+uint16_t BlitterReadWord(uint32_t, uint32_t who = UNKNOWN);
+uint32_t BlitterReadLong(uint32_t, uint32_t who = UNKNOWN);
+void BlitterWriteByte(uint32_t, uint8_t, uint32_t who = UNKNOWN);
+void BlitterWriteWord(uint32_t, uint16_t, uint32_t who = UNKNOWN);
+void BlitterWriteLong(uint32_t, uint32_t, uint32_t who = UNKNOWN);
 
-uint32 blitter_reg_read(uint32 offset);
-void blitter_reg_write(uint32 offset, uint32 data);
+uint32_t blitter_reg_read(uint32_t offset);
+void blitter_reg_write(uint32_t offset, uint32_t data);
 
-extern uint8 blitter_working;
+extern uint8_t blitter_working;
 
 //For testing only...
 void LogBlit(void);