From 44db6e39c387afae22ff047ecc8976448cd71659 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 8 Nov 2009 20:36:28 -0600
Subject: [PATCH] [devel] Make PNG_DEPSTRUCT, etc., configurable.

Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.
---
 ANNOUNCE  |  5 +++--
 CHANGES   |  3 ++-
 pngconf.h | 30 ++++++++++++++++++++----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 4714eb9b7..ec2090e6c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.0beta94 - November 8, 2009
+Libpng 1.4.0beta94 - November 9, 2009
 
 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.
@@ -634,10 +634,11 @@ version 1.4.0beta93 [November 7, 2009]
   Moved the synopsis lines for png_read_destroy(), png_write_destroy()
     png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.
 
-version 1.4.0beta94 [November 8, 2009]
+version 1.4.0beta94 [November 9, 2009]
   Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.
   Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.
   Removed dependency of pngtest.o on pngpriv.h in the makefiles.
+  Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 6d152112c..38f125b3a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2320,10 +2320,11 @@ version 1.4.0beta93 [November 7, 2009]
   Moved the synopsis lines for png_read_destroy(), png_write_destroy()
     png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.
 
-version 1.4.0beta94 [November 8, 2009]
+version 1.4.0beta94 [November 9, 2009]
   Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.
   Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.
   Removed dependency of pngtest.o on pngpriv.h in the makefiles.
+  Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index b01f62817..5780eb59e 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.4.0beta94 - November 7, 2009
+ * libpng version 1.4.0beta94 - November 9, 2009
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1291,17 +1291,27 @@ typedef char            FAR * FAR * FAR * png_charppp;
  * functions in png.h will generate compiler warnings.
  */
 #ifdef __GNUC__
-#  define PNG_DEPRECATED __attribute__((__deprecated__))
-#  define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#  define PNG_NORETURN   __attribute__((__noreturn__))
-#  define PNG_ALLOCATED  __attribute__((__malloc__))
+#  ifndef PNG_DEPRECATED
+#    define PNG_DEPRECATED __attribute__((__deprecated__))
+#  endif
+#  ifndef PNG_USE_RESULT
+#    define PNG_USE_RESULT __attribute__((__warn_unused_result__))
+#  endif
+#  ifndef PNG_NORETURN
+#    define PNG_NORETURN   __attribute__((__noreturn__))
+#  endif
+#  ifndef PNG_ALLOCATED
+#    define PNG_ALLOCATED  __attribute__((__malloc__))
+#  endif
 
 #  ifndef PNG_CONFIGURE_LIBPNG
-   /* This specifically protects structure members that should only be
-    * accessed from within the library, therefore should be empty during
-    * a library build.
-    */
-#    define PNG_DEPSTRUCT  __attribute__((__deprecated__))
+    /* This specifically protects structure members that should only be
+     * accessed from within the library, therefore should be empty during
+     * a library build.
+     */
+#    ifndef PNG_DEPSTRUCT
+#      define PNG_DEPSTRUCT  __attribute__((__deprecated__))
+#    endif
 #  endif
 #endif