[devel] Removed all remaining WIN32_WCE #ifdefs

This commit is contained in:
Glenn Randers-Pehrson 2009-11-01 06:45:09 -06:00
parent 07def6f68b
commit 418783e760
6 changed files with 6 additions and 18 deletions

View File

@ -595,6 +595,7 @@ 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
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -2281,6 +2281,7 @@ 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
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -264,14 +264,6 @@
# define PNG_STDIO_SUPPORTED
#endif
#ifdef _WIN32_WCE
# include <windows.h>
/* Console I/O functions are not supported on WindowsCE */
# define PNG_NO_CONSOLE_IO
# ifdef PNG_DEBUG
# undef PNG_DEBUG
# endif
#endif
#ifdef PNG_BUILD_DLL
# if !defined(PNG_CONSOLE_IO_SUPPORTED) && !defined(PNG_NO_CONSOLE_IO)
@ -331,7 +323,7 @@
#endif
/* Enough people need this for various reasons to include it here */
#if !defined(MACOS) && !defined(RISCOS) && !defined(_WIN32_WCE)
#if !defined(MACOS) && !defined(RISCOS)
# include <sys/types.h>
#endif
@ -1034,10 +1026,8 @@
/* Need the time information for reading tIME chunks */
#ifdef PNG_tIME_SUPPORTED
# ifndef _WIN32_WCE
/* "time.h" functions are not supported on WindowsCE */
# include <time.h>
# endif
#endif
/* Some typedefs to get us started. These should be safe on most of the
@ -1142,11 +1132,7 @@ typedef char FAR * png_charp;
typedef png_fixed_point FAR * png_fixed_point_p;
#ifndef PNG_NO_STDIO
# ifdef _WIN32_WCE
typedef HANDLE png_FILE_p;
# else
typedef FILE * png_FILE_p;
# endif
#endif
#ifdef PNG_FLOATING_POINT_SUPPORTED

View File

@ -113,7 +113,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
(user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
(user_png_ver[0] == '0' && user_png_ver[2] < '9'))
{
#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
#ifdef PNG_STDIO_SUPPORTED
char msg[80];
if (user_png_ver)
{

View File

@ -1315,7 +1315,7 @@ png_do_read_transformations(png_structp png_ptr)
if (png_ptr->row_buf == NULL)
{
#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
#ifdef PNG_STDIO_SUPPORTED)
char msg[50];
png_snprintf2(msg, 50,

View File

@ -532,7 +532,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
(user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
(user_png_ver[0] == '0' && user_png_ver[2] < '9'))
{
#if defined(PNG_STDIO_SUPPORTED) && !defined(_WIN32_WCE)
#ifdef PNG_STDIO_SUPPORTED
char msg[80];
if (user_png_ver)
{