From 45b8761bc8f5f843ebb2dd8bfefa8f87afec3b22 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Tue, 3 Nov 2009 11:42:05 -0600
Subject: [PATCH] [devel] Make #define PNG_CONVERT_tIME_SUPPORTED depend on
 PNG_tIME_SUPPORTED

---
 ANNOUNCE  |  2 ++
 CHANGES   |  2 ++
 pngconf.h | 21 +++++++++++++--------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 0c58bfe7c..04c58bd28 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -606,6 +606,8 @@ version 1.4.0beta91 [November 3, 2009]
   Added PNG_CONVERT_tIME_SUPPORTED macro.
 
 version 1.4.0beta92 [November 3, 2009]
+  Make inclusion of time.h in pngconf.h depend on PNG_CONVERT_tIME_SUPPORTED
+  Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_tIME_SUPPORTED
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 77b6d18bc..dfce09bef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2292,6 +2292,8 @@ version 1.4.0beta91 [November 3, 2009]
   Added PNG_CONVERT_tIME_SUPPORTED macro.
 
 version 1.4.0beta92 [November 3, 2009]
+  Make inclusion of time.h in pngconf.h depend on PNG_CONVERT_tIME_SUPPORTED
+  Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_tIME_SUPPORTED
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index 00a712e99..4f9c29a62 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -22,6 +22,8 @@
 #ifndef PNGCONF_H
 #define PNGCONF_H
 
+#define PNG_1_4_X
+
 #ifndef PNG_NO_LIMITS_H
 #  include <limits.h>
 #endif
@@ -997,13 +999,15 @@
 #  endif
 #endif
 
-#ifndef PNG_NO_CONVERT_tIME
-# ifndef _WIN32_WCE
-/* The "tm" structure is not supported on WindowsCE */
-#  ifndef PNG_CONVERT_tIME_SUPPORTED
-#    define PNG_CONVERT_tIME_SUPPORTED
+#ifdef PNG_tIME_SUPPORTED
+#  ifndef PNG_NO_CONVERT_tIME
+#    ifndef _WIN32_WCE
+/*   The "tm" structure is not supported on WindowsCE */
+#      ifndef PNG_CONVERT_tIME_SUPPORTED
+#        define PNG_CONVERT_tIME_SUPPORTED
+#      endif
 #   endif
-# endif
+#  endif
 #endif
 
 #endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
@@ -1033,8 +1037,9 @@
 #  define PNG_INFO_IMAGE_SUPPORTED
 #endif
 
-/* Need the time information for reading tIME chunks */
-#ifdef PNG_tIME_SUPPORTED
+/* Need the time information for converting tIME chunks */
+#ifdef PNG_CONVERT_tIME_SUPPORTED
+     /* "time.h" functions are not supported on WindowsCE */
 #    include <time.h>
 #endif