AuroraMiddleware/libpng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[devel] Define remaining attributes to blank when MSC_VER<1300.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-03-06 16:49:10 -06:00
parent ffc9e9503d
commit d32a671dff
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.2beta04 - March 3, 2011 Libpng 1.5.2beta04 - March 6, 2011
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -53,7 +53,8 @@ Version 1.5.2beta03 [March 3, 2011]
Updated contrib/pngsuite/README to add the word "modify". Updated contrib/pngsuite/README to add the word "modify".
Define PNG_ALLOCATED to blank when _MSC_VER<1300. Define PNG_ALLOCATED to blank when _MSC_VER<1300.
Version 1.5.2beta04 [March 3, 2011] Version 1.5.2beta04 [March 6, 2011]
Define remaining attributes to blank when MSC_VER<1300.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net: Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -3269,7 +3269,8 @@ Version 1.5.2beta03 [March 3, 2011]
Updated contrib/pngsuite/README to add the word "modify". Updated contrib/pngsuite/README to add the word "modify".
Define PNG_ALLOCATED to blank when _MSC_VER<1300. Define PNG_ALLOCATED to blank when _MSC_VER<1300.
Version 1.5.2beta04 [March 3, 2011] Version 1.5.2beta04 [March 6, 2011]
Define remaining attributes to blank when MSC_VER<1300.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

14
pngconf.h
View File

@ -302,9 +302,10 @@
* scripts directory. * scripts directory.
*/ */
#ifndef PNG_EXPORTA #ifndef PNG_EXPORTA
# define PNG_EXPORTA(ordinal, type, name, args, attributes)\ # define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), extern\ PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), \
attributes) extern attributes)
#endif #endif
/* ANSI-C (C90) does not permit a macro to be invoked with an empty argument, /* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
@ -393,7 +394,8 @@
# endif # endif
# endif /* PNGLIB_BUILD */ # endif /* PNGLIB_BUILD */
# endif /* __GNUC__ */ # endif /* __GNUC__ */
# ifdef _MSC_VER /* may need to check value */
# if defined(_MSC_VER) && (_MSC_VER >= 1300)
# ifndef PNG_USE_RESULT # ifndef PNG_USE_RESULT
# define PNG_USE_RESULT /* not supported */ # define PNG_USE_RESULT /* not supported */
# endif # endif
@ -404,11 +406,7 @@
# define PNG_PTR_NORETURN /* not supported */ # define PNG_PTR_NORETURN /* not supported */
# endif # endif
# ifndef PNG_ALLOCATED # ifndef PNG_ALLOCATED
# if (_MSC_VER < 1300) # define PNG_ALLOCATED __declspec(restrict)
# define PNG_ALLOCATED /* not supported */
# else
# define PNG_ALLOCATED __declspec(restrict)
# endif
# endif # endif
/* This specifically protects structure members that should only be /* This specifically protects structure members that should only be