From: Thomas Klausner <wiz@NetBSD.org>
Date: Sun, 3 Apr 2011 17:32:17 +0000 (+0200)
Subject: png-1.5 defines PNG_CALLBACK as well, so rename our PNG_CALLBACK
X-Git-Tag: v1.46~7
X-Git-Url: https://repo.or.cz/w/glpng.git/commitdiff_plain/4759b94bae292ec8f933efcb20172306da261e6f

png-1.5 defines PNG_CALLBACK as well, so rename our PNG_CALLBACK
to PNG_CALLBACKT.
---

diff --git a/include/GL/glpng.h b/include/GL/glpng.h
index c23ebcb..d732d4d 100644
--- a/include/GL/glpng.h
+++ b/include/GL/glpng.h
@@ -57,7 +57,7 @@ extern "C" {
 #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
 
 /* Transparency parameters */
-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
+#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha   */
 #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
 #define PNG_SOLID     -1 /* No transparency                                */
 #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
diff --git a/src/glpng.c b/src/glpng.c
index a3cd6e9..6689754 100644
--- a/src/glpng.c
+++ b/src/glpng.c
@@ -564,7 +564,7 @@ int APIENTRY pngLoadF(FILE *fp, int mipmap, int trans, pngInfo *pinfo) {
 			#define ALPHA *q
 
 			switch (trans) {
-				case PNG_CALLBACK:
+				case PNG_CALLBACKT:
 					FORSTART
 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
 					FOREND