fixing merge conflicts

1 files changed, 7 insertions, 0 deletions

diff --git a/include/blit.h b/include/blit.h
index e7f384cc8..2fe99d7bd 100644
--- a/include/blit.h
+++ b/include/blit.h
@@ -1,6 +1,13 @@
 #ifndef GUARD_BLIT_H
 #define GUARD_BLIT_H
 
+struct Bitmap
+{
+    u8* pixels;
+    u32 width:16;
+    u32 height:16;
+};
+
 void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height);
 void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey);
 void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);