[master] Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_tIME_SUPPORTED

This commit is contained in:
Glenn Randers-Pehrson 2009-11-03 11:42:47 -06:00
parent b83df4e711
commit 8cf8726c7c
3 changed files with 14 additions and 10 deletions

View File

@ -118,6 +118,8 @@ version 1.2.41beta13 [November 3, 2009]
version 1.2.41beta14 [November 3, 2009] version 1.2.41beta14 [November 3, 2009]
Added empty pngpriv.h file as an aid to migration to 1.4.x 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -2548,6 +2548,8 @@ version 1.2.41beta13 [November 3, 2009]
version 1.2.41beta14 [November 3, 2009] version 1.2.41beta14 [November 3, 2009]
Added empty pngpriv.h file as an aid to migration to 1.4.x 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -1162,13 +1162,15 @@
# endif # endif
#endif #endif
#ifndef PNG_NO_CONVERT_tIME #ifdef PNG_tIME_SUPPORTED
# ifndef _WIN32_WCE # ifndef PNG_NO_CONVERT_tIME
/* The "tm" structure is not supported on WindowsCE */ # ifndef _WIN32_WCE
# ifndef PNG_CONVERT_tIME_SUPPORTED /* The "tm" structure is not supported on WindowsCE */
# define PNG_CONVERT_tIME_SUPPORTED # ifndef PNG_CONVERT_tIME_SUPPORTED
# define PNG_CONVERT_tIME_SUPPORTED
# endif
# endif # endif
# endif # endif
#endif #endif
#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */ #endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
@ -1199,12 +1201,10 @@
# define PNG_INFO_IMAGE_SUPPORTED # define PNG_INFO_IMAGE_SUPPORTED
#endif #endif
/* need the time information for reading tIME chunks */ /* Need the time information for converting tIME chunks */
#ifdef PNG_tIME_SUPPORTED #ifdef PNG_CONVERT_tIME_SUPPORTED
# ifndef _WIN32_WCE
/* "time.h" functions are not supported on WindowsCE */ /* "time.h" functions are not supported on WindowsCE */
# include <time.h> # include <time.h>
# endif
#endif #endif
/* Some typedefs to get us started. These should be safe on most of the /* Some typedefs to get us started. These should be safe on most of the