[master] Correct use of _WINDOWS_ in pngconf.h; Removed png_mem_ #defines;

they are no longer used.
This commit is contained in:
Glenn Randers-Pehrson
2010-08-03 20:26:34 -05:00
parent 3e71719502
commit d3a726db0d
5 changed files with 18 additions and 23 deletions

View File

@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.5.0beta40 - August 2, 2010
* libpng version 1.5.0beta40 - 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)
@@ -154,10 +154,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
/* Moved here around 1.5.0beta36 from pngconf.h */