From 41b1ffdf36c076129343011107382477615d10c2 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 3 Mar 2011 06:24:32 -0600 Subject: [PATCH] [devel] Make PNG_ALLOCATED blank when _MSC_VER<1300 in pngconf.h --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- pngconf.h | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 2d14b6439..aafa24fa5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.2beta03 - February 28, 2011 +Libpng 1.5.2beta03 - March 3, 2011 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. @@ -48,9 +48,10 @@ Version 1.5.2beta02 [February 19, 2011] This documents the current behavior, where the callback is called after every row with information pertaining to the next row. -Version 1.5.2beta03 [February 28, 2011] +Version 1.5.2beta03 [March 3, 2011] Fixed scripts/makefile.vcwin32 Updated contrib/pngsuite/README to add the word "modify". + Define PNG_ALLOCATED to blank when _MSC_VER<1300. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 7964982e6..549346f35 100644 --- a/CHANGES +++ b/CHANGES @@ -3264,9 +3264,10 @@ Version 1.5.2beta02 [February 19, 2011] This documents the current behavior, where the callback is called after every row with information pertaining to the next row. -Version 1.5.2beta03 [February 28, 2011] +Version 1.5.2beta03 [March 3, 2011] Fixed scripts/makefile.vcwin32 Updated contrib/pngsuite/README to add the word "modify". + Define PNG_ALLOCATED to blank when _MSC_VER<1300. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngconf.h b/pngconf.h index 11007020d..e74d12799 100644 --- a/pngconf.h +++ b/pngconf.h @@ -404,7 +404,11 @@ # define PNG_PTR_NORETURN /* not supported */ # endif # ifndef PNG_ALLOCATED -# define PNG_ALLOCATED __declspec(restrict) +# if (_MSC_VER < 1300) +# define PNG_ALLOCATED /* not supported */ +# else +# define PNG_ALLOCATED __declspec(restrict) +# endif # endif /* This specifically protects structure members that should only be