Imported from libpng-1.4.0beta49.tar

pngconf.h

@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.4.0beta48 - February 14, 2009
+ * libpng version 1.4.0beta49 - February 28, 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)
@@ -43,6 +43,11 @@
 #include "pngusr.h"
 #endif
 
+/* Added at libpng-1.4.0beta49 for testing */
+#ifndef PNG_NO_CALLOC
+#  define PNG_CALLOC_SUPPORTED
+#endif
+
 /*  
  * If you create a private DLL you need to define in "pngusr.h" the followings:
  * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
@@ -1334,6 +1339,7 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #  define NOCHECK 0
 #  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
 #  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
+#  define png_fileno  _fileno     /* Added to v 1.4.0 */
 #  define png_strcpy  _fstrcpy
 #  define png_strncpy _fstrncpy   /* Added to v 1.2.6 */
 #  define png_strlen  _fstrlen
@@ -1345,6 +1351,7 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #  if defined(_WINDOWS_)  /* favor Windows over C runtime fns */
 #    define CVT_PTR(ptr)         (ptr)
 #    define CVT_PTR_NOCHECK(ptr) (ptr)
+#    define png_fileno  fileno
 #    define png_strcpy  lstrcpyA
 #    define png_strncpy lstrcpynA
 #    define png_strlen  lstrlenA
@@ -1355,6 +1362,7 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #  else
 #    define CVT_PTR(ptr)         (ptr)
 #    define CVT_PTR_NOCHECK(ptr) (ptr)
+#    define png_fileno  fileno      /* Added to v 1.4.0 */
 #    define png_strcpy  strcpy
 #    define png_strncpy strncpy     /* Added to v 1.2.6 */
 #    define png_strlen  strlen