From 1f0eaa046c756b98b31a0c1e8f8cc1704e661a92 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Thu, 1 Dec 2011 21:45:34 -0600
Subject: [PATCH] [libpng16] Revised pngconf.h to use " __declspec(restrict)"
 if MSC_VER >= 1400.

---
 ANNOUNCE  | 6 ++++--
 CHANGES   | 4 +++-
 pngconf.h | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 0bc74e7c5..7553d6a9d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.0alpha01 - November 29, 2011
+Libpng 1.6.0alpha01 - December 2, 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.
@@ -107,7 +107,7 @@ Version 1.5.7beta05 [(PENDING RELEASE)]
   Added MINGW support to CMakeLists.txt
   Reject invalid compression flag or method when reading the iTXt chunk.
 
-Version 1.6.0alpha01 [November 29, 2011]
+Version 1.6.0alpha01 [December 2, 2011]
   Removed machine-generated configure files from the GIT repository (they will
     continue to appear in the tarball distributions).
   Restored the new 'simplified' API, which was deleted from libpng-1.5.7.
@@ -131,6 +131,8 @@ Version 1.6.0alpha01 [November 29, 2011]
     to read such images).
   Replaced an "#if" with "ifdef" in pngrtran.c
   New tools directory containing tools used to generate libpng code.
+  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 ffd07f69e..41a4b4282 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3752,7 +3752,7 @@ Version 1.5.7beta05 [(PENDING RELEASE)]
   Added MINGW support to CMakeLists.txt
   Reject invalid compression flag or method when reading the iTXt chunk.
 
-Version 1.6.0alpha01 [November 29, 2011]
+Version 1.6.0alpha01 [December 2, 2011]
   Removed machine-generated configure files from the GIT repository (they will
     continue to appear in the tarball distributions).
   Restored the new 'simplified' API, which was deleted from libpng-1.5.7.
@@ -3776,6 +3776,8 @@ Version 1.6.0alpha01 [November 29, 2011]
     to read such images).
   Replaced an "#if" with "ifdef" in pngrtran.c
   New tools directory containing tools used to generate libpng code.
+  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 32fe3924b..f35aaa67e 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.0alpha01 - November 27, 2011
+ * libpng version 1.6.0alpha01 - December 2, 2011
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -370,7 +370,7 @@
 #      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