Merge branch 'libpng17' into 20160506-write

This commit is contained in:
John Bowler
2016-05-18 08:41:15 -07:00
4 changed files with 17 additions and 6 deletions

View File

@@ -44,8 +44,10 @@
# define voidcast(type, value) (value)
#endif /* __cplusplus */
#if ((defined(PNG_SEQUENTIAL_READ_SUPPORTED)) && defined(PNG_STDIO_SUPPORTED)\
&& defined(PNG_EASY_ACCESS_SUPPORTED) && defined(PNG_INFO_IMAGE_SUPPORTED))
#if defined (CLOCK_PROCESS_CPUTIME_ID) && \
defined (PNG_SEQUENTIAL_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED) \
&& defined(PNG_EASY_ACCESS_SUPPORTED) && defined(PNG_INFO_IMAGE_SUPPORTED)
typedef struct
{
FILE *input;