From dacdea768c13e83fd127f0de10ca35860e4ad6c6 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 23 Jan 2016 14:58:47 +0000
Subject: fix argb_to_rgba definition weirdness

---
 amiga/bitmap.c | 2 ++
 amiga/bitmap.h | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index e233e7b0e..6314ea34a 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -248,6 +248,7 @@ static size_t bitmap_get_bpp(void *vbitmap)
 	return 4;
 }
 
+#ifdef __amigaos4__
 static void ami_bitmap_argb_to_rgba(struct bitmap *bm)
 {
 	if(bm == NULL) return;
@@ -257,6 +258,7 @@ static void ami_bitmap_argb_to_rgba(struct bitmap *bm)
 		data[i] = (data[i] << 8) | (data[i] >> 24);
 	}
 }
+#endif
 
 #ifdef BITMAP_DUMP
 void bitmap_dump(struct bitmap *bitmap)
diff --git a/amiga/bitmap.h b/amiga/bitmap.h
index ff1b01c6e..20e631585 100755
--- a/amiga/bitmap.h
+++ b/amiga/bitmap.h
@@ -53,10 +53,6 @@ PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
 Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap);
 struct bitmap *ami_bitmap_from_datatype(char *filename);
 
-#ifndef __amigaos4__
-void ami_bitmap_argb_to_rgba(struct bitmap *bm);
-#endif
-
 /**
  * Create a bitmap.
  *
-- 
cgit v1.2.3