From 8cf8726c7cad54781809782f06af33ecef26e1ef Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 3 Nov 2009 11:42:47 -0600 Subject: [PATCH] [master] Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_tIME_SUPPORTED --- ANNOUNCE | 2 ++ CHANGES | 2 ++ pngconf.h | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 51b6993f..7e6b30cb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -118,6 +118,8 @@ version 1.2.41beta13 [November 3, 2009] version 1.2.41beta14 [November 3, 2009] Added empty pngpriv.h file as an aid to migration to 1.4.x + 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 diff --git a/CHANGES b/CHANGES index 00f52fa7..a35caa9b 100644 --- a/CHANGES +++ b/CHANGES @@ -2548,6 +2548,8 @@ version 1.2.41beta13 [November 3, 2009] version 1.2.41beta14 [November 3, 2009] Added empty pngpriv.h file as an aid to migration to 1.4.x + 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 378285e1..d3c986bc 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1162,13 +1162,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 */ @@ -1199,12 +1201,10 @@ # define PNG_INFO_IMAGE_SUPPORTED #endif -/* need the time information for reading tIME chunks */ -#ifdef PNG_tIME_SUPPORTED -# ifndef _WIN32_WCE +/* Need the time information for converting tIME chunks */ +#ifdef PNG_CONVERT_tIME_SUPPORTED /* "time.h" functions are not supported on WindowsCE */ # include -# endif #endif /* Some typedefs to get us started. These should be safe on most of the