[devel] Put #ifndef PNG_EXTERN, #endif around #define PNG_EXTERN in pngpriv.h
diff --git a/ANNOUNCE b/ANNOUNCE
index 2dc4b73..6f71706 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.0beta34 - July 6, 2010
+Libpng 1.5.0beta34 - July 11, 2010
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.
@@ -226,7 +226,7 @@
offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.
Added more blank lines for readability.
-version 1.5.0beta25 [July 6, 2010]
+version 1.5.0beta25 [July 11, 2010]
In pngpread.c: png_push_have_row() add check for new_row > height
Removed the now-redundant check for out-of-bounds new_row from example.c
@@ -278,7 +278,8 @@
Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans)
Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {')
-version 1.5.0beta34 [July 6, 2010]
+version 1.5.0beta34 [July 11, 2010]
+ Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
diff --git a/pngpriv.h b/pngpriv.h
index 885c2dc..db69502 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.5.0beta34 - July 6, 2010
+ * libpng version 1.5.0beta34 - July 11, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -143,14 +143,16 @@
# define PNG_GAMMA_THRESHOLD 0.05
#endif
+#ifndef PNG_EXTERN
/* The functions exported by PNG_EXTERN are internal functions, which
* aren't usually used outside the library (as far as I know), so it is
* debatable if they should be exported at all. In the future, when it
* is possible to have run-time registry of chunk-handling functions,
* some of these will be made available again.
-#define PNG_EXTERN extern
+# define PNG_EXTERN extern
*/
-#define PNG_EXTERN
+# define PNG_EXTERN
+#endif
/* Other defines specific to compilers can go here. Try to keep
* them inside an appropriate ifdef/endif pair for portability.
