From 99106deaa2f72558bdf0a8d5e6fb0b75bdfb5a0a Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 1 Nov 2009 16:26:14 -0600
Subject: [PATCH] [devel] Restored WIN32_WCE #ifdefs involving the time.h "tm"
 structure

WindowsCE does not provide the "tm" structure.
---
 ANNOUNCE   | 3 ++-
 CHANGES    | 3 ++-
 png.h      | 3 +++
 pngwrite.c | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 9c403657b..44d6ce3cf 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -595,7 +595,8 @@ version 1.4.0beta89 [November 1, 2009]
   Merged libpng-1.2.41.txt with libpng-1.4.0.txt where appropriate.
 
 version 1.4.0beta90 [November 1, 2009]
-  Removed all remaining WIN32_WCE #ifdefs
+  Removed all remaining WIN32_WCE #ifdefs except those involving the
+    time.h "tm" structure
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index bb5a0b366..70095b5a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2281,7 +2281,8 @@ version 1.4.0beta89 [November 1, 2009]
   Merged libpng-1.2.41.txt with libpng-1.4.0.txt where appropriate.
 
 version 1.4.0beta90 [November 1, 2009]
-  Removed all remaining WIN32_WCE #ifdefs
+  Removed all remaining WIN32_WCE #ifdefs except those involving the
+    time "tm" structure
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.h b/png.h
index 124172644..14cd12fde 100644
--- a/png.h
+++ b/png.h
@@ -1443,12 +1443,15 @@ extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
 
 #ifdef PNG_WRITE_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 */
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
diff --git a/pngwrite.c b/pngwrite.c
index 44c754297..5041c7fb5 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -421,6 +421,8 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
 }
 
 #ifdef PNG_WRITE_tIME_SUPPORTED
+#ifndef _WIN32_WCE
+/* "tm" structure is not supported on WindowsCE */
 void PNGAPI
 png_convert_from_struct_tm(png_timep ptime, struct tm FAR * ttime)
 {
@@ -445,7 +447,7 @@ png_convert_from_time_t(png_timep ptime, time_t ttime)
    png_convert_from_struct_tm(ptime, tbuf);
 }
 #endif
-
+#endif
 
 /* Initialize png_ptr structure, and allocate any memory needed */
 png_structp PNGAPI