From 158c947ce2e003f3bd4e47b0f8ddbf290db0fae7 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Fri, 22 Nov 2013 18:34:37 -0600 Subject: [PATCH] [libpng17] Revert recent change to pngvalid.c. --- contrib/libtests/pngvalid.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index fcf4481d7..1fbaafc9c 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1964,11 +1964,9 @@ typedef struct png_modifier } png_modifier; /* This returns true if the test should be stopped now because it has already - * failed and it is running silently. It is not static simply to avoid having - * to special case it on all the #ifdefs on which it depends. - */ -extern int fail(png_modifier *pm); -/*static*/ int fail(png_modifier *pm) + * failed and it is running silently. + */ +static int fail(png_modifier *pm) { return !pm->log && !pm->this.verbose && (pm->this.nerrors > 0 || (pm->this.treat_warnings_as_errors && pm->this.nwarnings > 0)); @@ -10479,6 +10477,9 @@ int main(int argc, char **argv) } } + /* This is required because some very minimal configurations do not use it: + */ + UNUSED(fail) return 0; } #else /* write or low level APIs not supported */