From d86cb419721a470b38790e27650fa84ff13cafbc Mon Sep 17 00:00:00 2001
From: "Anthony J. Bentley" <anthony@anjbe.name>
Date: Sat, 22 Oct 2016 14:03:14 -0600
Subject: [PATCH] Rename png.h to makepng.h, to avoid conflicts with libpng's
 png.h.

---
 Makefile                         | 2 +-
 include/gfx/main.h               | 2 +-
 include/gfx/{png.h => makepng.h} | 0
 src/gfx/{png.c => makepng.c}     | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename include/gfx/{png.h => makepng.h} (100%)
 rename src/gfx/{png.c => makepng.c} (100%)

diff --git a/Makefile b/Makefile
index b9d8e66f..5f3be4aa 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ rgbfix_obj = \
 rgbgfx_obj = \
 	src/gfx/gb.o \
 	src/gfx/main.o \
-	src/gfx/png.o \
+	src/gfx/makepng.o \
 	src/extern/err.o
 
 all: rgbasm rgblink rgbfix rgbgfx
diff --git a/include/gfx/main.h b/include/gfx/main.h
index a329ed6a..a6377819 100644
--- a/include/gfx/main.h
+++ b/include/gfx/main.h
@@ -69,7 +69,7 @@ struct Tilemap {
 
 int depth, colors;
 
-#include "gfx/png.h"
+#include "gfx/makepng.h"
 #include "gfx/gb.h"
 
 #endif
diff --git a/include/gfx/png.h b/include/gfx/makepng.h
similarity index 100%
rename from include/gfx/png.h
rename to include/gfx/makepng.h
diff --git a/src/gfx/png.c b/src/gfx/makepng.c
similarity index 100%
rename from src/gfx/png.c
rename to src/gfx/makepng.c