[libpng16] Imported from libpng-1.6.0beta01.tar

contrib/libtests/pngvalid.c

@@ -36,7 +36,7 @@
 #include "../../png.h"
 
 #if PNG_LIBPNG_VER < 10500
-/* This delibarately lacks the PNG_CONST. */
+/* This deliberately lacks the PNG_CONST. */
 typedef png_byte *png_const_bytep;
 
 /* This is copied from 1.5.1 png.h: */
@@ -9388,7 +9388,7 @@ int main(int argc, PNG_CONST char **argv)
    size_t cp = 0;
    char command[1024];
 
-   context(&pm.this, fault);
+   anon_context(&pm.this);
 
    /* Add appropriate signal handlers, just the ANSI specified ones: */
    signal(SIGABRT, signal_handler);
@@ -9750,7 +9750,7 @@ int main(int argc, PNG_CONST char **argv)
 #endif
    }
 
-   Catch(fault)
+   Catch_anonymous
    {
       fprintf(stderr, "pngvalid: test aborted (probably failed in cleanup)\n");
       if (!pm.this.verbose)

contrib/libtests/timepng.c

@@ -14,8 +14,11 @@
  * does no transforms.  The only output is a time as a floating point number of
  * seconds with 9 decimal digits.
  */
+#define _POSIX_C_SOURCE 199309L /* for clock_gettime */
+
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <time.h>