[devel] Restored WIN32_WCE #ifdefs involving the time.h "tm" structure
WindowsCE does not provide the "tm" structure.
This commit is contained in:
parent
34a2ebdc4f
commit
99106deaa2
3
ANNOUNCE
3
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
|
||||
|
3
CHANGES
3
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
|
||||
|
3
png.h
3
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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user