[libpng15] Revised pngconf.h to use " __declspec(restrict)" if MSC_VER >= 1400,

as in libpng-1.5.4.

3 files changed, 6 insertions, 2 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 4efba2952..0bc6bee20 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -120,6 +120,8 @@ Version 1.5.7rc01 [December 1, 2011]
 Version 1.5.7rc02 [December 2, 2011]
   Revised project files and contrib/pngvalid/pngvalid.c to account for
     the relocation of pngvalid into contrib/libtests.
+  Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
+    as in libpng-1.5.4.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index d65313a5c..799ab2ce3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3765,6 +3765,8 @@ Version 1.5.7rc01 [December 1, 2011]
 Version 1.5.7rc02 [December 2, 2011]
   Revised project files and contrib/pngvalid/pngvalid.c to account for
     the relocation of pngvalid into contrib/libtests.
+  Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
+    as in libpng-1.5.4.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index 191053473..af4e43fe6 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -366,10 +366,10 @@
 #      define PNG_USE_RESULT /* not supported */
 #    endif
 #    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __declspec(noreturn)
+#      define PNG_NORETURN __declspec(noreturn)
 #    endif
 #    ifndef PNG_ALLOCATED
-#      if defined(_MSC_VER)  && (_MSC_VER >= 1300)
+#      if (_MSC_VER >= 1400)
 #        define PNG_ALLOCATED __declspec(restrict)
 #      endif
 #    endif