From d32a671dff8f18ddacd3ca2838701311ffa6567b Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 6 Mar 2011 16:49:10 -0600
Subject: [PATCH] [devel] Define remaining attributes to blank when
 MSC_VER<1300.

---
 ANNOUNCE  |  5 +++--
 CHANGES   |  3 ++-
 pngconf.h | 14 ++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index ba8e8f97d..518742a72 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -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
 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".
   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:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index ddcf8424f..937f7be4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3269,7 +3269,8 @@ Version 1.5.2beta03 [March 3, 2011]
   Updated contrib/pngsuite/README to add the word "modify".
   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
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index 5c24bb2f5..87bc5ade4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -302,9 +302,10 @@
     * scripts directory.
     */
 #ifndef PNG_EXPORTA
+
 #  define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-      PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), extern\
-         attributes)
+      PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), \
+        extern attributes)
 #endif
 
 /* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
@@ -393,7 +394,8 @@
 #      endif
 #    endif /* PNGLIB_BUILD */
 #  endif /* __GNUC__ */
-#  ifdef _MSC_VER /* may need to check value */
+
+#  if defined(_MSC_VER)  && (_MSC_VER >= 1300)
 #    ifndef PNG_USE_RESULT
 #      define PNG_USE_RESULT /* not supported */
 #    endif
@@ -404,11 +406,7 @@
 #      define PNG_PTR_NORETURN /* not supported */
 #    endif
 #    ifndef PNG_ALLOCATED
-#      if (_MSC_VER < 1300)
-#         define PNG_ALLOCATED /* not supported */
-#      else
-#         define PNG_ALLOCATED __declspec(restrict)
-#      endif
+#      define PNG_ALLOCATED __declspec(restrict)
 #    endif
 
     /* This specifically protects structure members that should only be