From 0cb46e200c7a7323b0857944d3720d5fab16f886 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 2 Nov 2009 11:24:33 -0600
Subject: [PATCH] [devel] Added PNG_CONVERT_tIME_SUPPORTED macro.

---
 ANNOUNCE  |  2 ++
 CHANGES   |  2 ++
 png.h     |  7 ++-----
 pngconf.h | 11 +++++++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 9d55e01a9..d50209f29 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -599,6 +599,8 @@ version 1.4.0beta90 [November 2, 2009]
     time.h "tm" structure
 
 version 1.4.0beta91 [November 2, 2009]
+  Patched ltmain.sh for wince support.
+  Added PNG_CONVERT_tIME_SUPPORTED macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 9df7aedd8..3e843ee47 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2285,6 +2285,8 @@ version 1.4.0beta90 [November 2, 2009]
     time.h "tm" structure
 
 version 1.4.0beta91 [November 2, 2009]
+  Patched ltmain.sh for wince support.
+  Added PNG_CONVERT_tIME_SUPPORTED macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.h b/png.h
index 770a134fb..5b375cb15 100644
--- a/png.h
+++ b/png.h
@@ -1441,18 +1441,15 @@ extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
    PNGARG((png_structp png_ptr, png_timep ptime));
 #endif
 
-#ifdef PNG_WRITE_tIME_SUPPORTED
+#ifdef PNG_CONVERT_tIME_SUPPORTED
 /* Convert from a struct tm to png_time */
-#  ifndef _WIN32_WCE
-/* "tm" structure is not supported on WindowsCE */
 extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
    struct tm FAR * ttime));
 
 /* Convert from time_t to png_time.  Uses gmtime() */
 extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
    time_t ttime));
-#  endif /* _WIN32_WCE */
-#endif /* PNG_WRITE_tIME_SUPPORTED */
+#endif /* PNG_CONVERT_tIME_SUPPORTED */
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
 /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
diff --git a/pngconf.h b/pngconf.h
index 89fb2d18d..a7351f2a9 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -997,9 +997,16 @@
 #  endif
 #endif
 
-#endif /* PNG_WRITE_ANCILLARY_CHUNKS_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
 
-#define PNG_CONVERT_tIME_SUPPORTED (PNG_tIME_SUPPORTED && !WIN32_WCE)
+#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
 
 #if !defined(PNG_NO_WRITE_FILTER) && !defined(PNG_WRITE_FILTER_SUPPORTED)
 #  define PNG_WRITE_FILTER_SUPPORTED