[master] Correct use of _WINDOWS_ in pngconf.h

This commit is contained in:
Glenn Randers-Pehrson
2010-08-03 21:10:04 -05:00
parent d8daacf157
commit 902d4d109a
4 changed files with 14 additions and 15 deletions

View File

@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.4.4beta05 - August 3, 2010
* libpng version 1.4.4beta05 - August 4, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -77,10 +77,6 @@
#if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \
defined(_WIN32) || defined(__WIN32__)
# include <windows.h> /* defines _WINDOWS_ macro */
/* I have no idea why is this necessary... */
# ifdef _MSC_VER
# include <malloc.h>
# endif
#endif
/* Various modes of operation. Note that after an init, mode is set to