[libpng16] Revised config.h handling; added bsconfig.h, deleted pngconfig.h

This commit is contained in:
John Bowler
2011-12-17 14:21:54 -06:00
committed by Glenn Randers-Pehrson
parent d1dceee2f7
commit ba6fbc57ba
12 changed files with 67 additions and 55 deletions

17
contrib/libtests/config.h Normal file
View File

@@ -0,0 +1,17 @@
/*-
* config.h
*
* Copyright (c) 2011 John Cunningham Bowler
*
* Last changed in libpng 1.6.0 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
*
* Use the "config.h" generated by configure for libpng. For indpendent
* compilation of the .c files in this directory either make an appropriate
* configure script to generate config.h or do not define HAVE_CONFIG_H.
*/
#include "../../bsconfig.h"

View File

@@ -3,7 +3,7 @@
*
* Copyright (c) 2011 John Cunningham Bowler
*
* Last changed in libpng 1.5.7 [(PENDING RELEASE)]
* Last changed in libpng 1.6.0 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -23,7 +23,7 @@
#include <math.h>
#ifdef HAVE_CONFIG_H
# include "../../config.h"
# include "config.h"
#endif
#include "../../png.h"

View File

@@ -1,7 +1,7 @@
/* pngvalid.c - validate libpng by constructing then reading png files.
*
* Last changed in libpng 1.5.7 [(PENDING RELEASE)]
* Last changed in libpng 1.6.0 [(PENDING RELEASE)]
* Copyright (c) 2011 Glenn Randers-Pehrson
* Written by John Cunningham Bowler
*
@@ -25,7 +25,7 @@
#include <signal.h>
#include "../../pngconfig.h"
#include "config.h"
#ifdef HAVE_FEENABLEEXCEPT
# include <fenv.h>

View File

@@ -2,7 +2,7 @@
*
* Copyright (c) 2011 John Cunningham Bowler
*
* Last changed in libpng 1.5.7 [(PENDING RELEASE)]
* Last changed in libpng 1.6.0 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -23,7 +23,7 @@
#include <time.h>
#ifdef HAVE_CONFIG_H
# include "../../config.h"
# include "config.h"
#endif
#include "../../png.h"