2007-09-13 Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* png.c: Add port info.

	* png.h: Add port info.

	* pngconf.h: Add declaration for snprintf.





diff -aprNU5 libpng-1.2.20.orig/png.c libpng-1.2.20/png.c
--- libpng-1.2.20.orig/png.c	2007-09-08 03:22:56 +0000
+++ libpng-1.2.20/png.c	2007-09-13 00:51:34 +0000
@@ -18,11 +18,11 @@ typedef version_1_2_20 Your_png_h_is_not
 /* Version information for C files.  This had better match the version
  * string defined in png.h.  */
 
 #ifdef PNG_USE_GLOBAL_ARRAYS
 /* png_libpng_ver was changed to a function in version 1.0.5c */
-PNG_CONST char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING;
+PNG_CONST char png_libpng_ver[37] = PNG_LIBPNG_VER_STRING;
 
 #ifdef PNG_READ_SUPPORTED
 
 /* png_sig was changed to a function in version 1.0.5c */
 /* Place to hold the signature string for a PNG file. */
diff -aprNU5 libpng-1.2.20.orig/png.h libpng-1.2.20/png.h
--- libpng-1.2.20.orig/png.h	2007-09-08 03:22:56 +0000
+++ libpng-1.2.20/png.h	2007-09-13 00:43:36 +0000
@@ -361,13 +361,13 @@
  * with some code on which to build.  This file is useful for looking
  * at the actual function definitions and structure components.
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.20"
+#define PNG_LIBPNG_VER_STRING "1.2.20  (DJGPP port (r1))"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.20 - September 8, 2007\n"
+   " libpng version 1.2.20 - September 8, 2007  (DJGPP port (r1))\n"
 
 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
 
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
@@ -487,11 +487,11 @@ extern "C" {
 #if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
 /* Version information for C files, stored in png.c.  This had better match
  * the version above.
  */
 #ifdef PNG_USE_GLOBAL_ARRAYS
-PNG_EXPORT_VAR (PNG_CONST char) png_libpng_ver[18];
+PNG_EXPORT_VAR (PNG_CONST char) png_libpng_ver[37];
   /* need room for 99.99.99beta99z */
 #else
 #define png_libpng_ver png_get_header_ver(NULL)
 #endif
 
diff -aprNU5 libpng-1.2.20.orig/pngconf.h libpng-1.2.20/pngconf.h
--- libpng-1.2.20.orig/pngconf.h	2007-09-08 03:22:56 +0000
+++ libpng-1.2.20/pngconf.h	2007-09-13 17:07:18 +0000
@@ -1443,10 +1443,19 @@ typedef z_stream FAR *  png_zstreamp;
 #      define png_snprintf6 _snprintf
 #    else
 #      define png_snprintf snprintf   /* Added to v 1.2.19 */
 #      define png_snprintf2 snprintf
 #      define png_snprintf6 snprintf
+#      if __DJGPP__
+         /*
+          *  As long as djdev204 has not replaced
+          *  djdev203, this version of snprintf
+          *  from djgpp CVS will be used for both
+          *  djdev204 beta and djdev203.
+          */
+#        include "djgpp/stdio.h"
+#      endif
 #    endif
 #  else
      /* You don't have or don't want to use snprintf().  Caution: Using
       * sprintf instead of snprintf exposes your application to accidental
       * or malevolent buffer overflows.  If you don't have snprintf()
