From 88e7d62fbcd34cd5a89eee72127bd6b12bd04a9c Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Fri, 7 Mar 2014 11:26:16 -0600
Subject: [PATCH] [libpng17] Remove CALLOC_SUPPORTED from
 scripts/pnglibconf.dfa and prebuilt

---
 scripts/pnglibconf.dfa        | 4 ----
 scripts/pnglibconf.h.prebuilt | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index 6a01a622b..9eb0bfb73 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -339,10 +339,6 @@ option FLOATING_ARITHMETIC
 option FLOATING_POINT
 option FIXED_POINT
 
-# The following is always on (defined empty)
-
-setting CALLOC_SUPPORTED default
-
 # This protects us against compilers that run on a windowing system
 # and thus don't have or would rather us not use the stdio types:
 # stdin, stdout, and stderr.  The only one currently used is stderr
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 9120756cc..a96a63fd7 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.7.0beta34 - February 27, 2014 */
+/* Libpng version 1.7.0beta34 - March 7, 2014 */
 
 /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
 
@@ -186,7 +186,6 @@
 /* settings */
 #define PNG_ABORT { (abort()); }
 #define PNG_API_RULE 0
-#define PNG_CALLOC_SUPPORTED
 #define PNG_COST_SHIFT 3
 #define PNG_DEFAULT_READ_MACROS 1
 #define PNG_GAMMA_THRESHOLD_FIXED 5000