From 6d751ff30257ce2f24b8f1aadb848438786b2949 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Fri, 15 Mar 2019 18:46:25 -0400
Subject: [PATCH] Remove the define.
---
src/w_wad.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/w_wad.c b/src/w_wad.c
index 4f0142081..c4f9ceca8 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1182,19 +1182,17 @@ void zerr(int ret)
#define NO_PNG_LUMPS
#ifdef NO_PNG_LUMPS
-static void ErrorIfPNG(void *d, size_t s, char *f, char *l)
+static void ErrorIfPNG(UINT8 *d, size_t s, char *f, char *l)
{
if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/
return;
-#define sigcheck ((UINT8 *)d)
// Check for PNG file signature using memcmp
// As it may be faster on CPUs with slow unaligned memory access
// Ref: http://www.libpng.org/pub/png/spec/1.2/PNG-Rationale.html#R.PNG-file-signature
- if (memcmp(&sigcheck[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0)
+ if (memcmp(&d[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0)
{
I_Error("W_Wad: Lump \"%s\" in file \"%s\" is a .PNG - please convert to either Doom or Flat (raw) image format.", l, f);
}
-#undef sigcheck
}
#endif