diff options
author | John Bowler <jbowler@acm.org> | 2016-12-26 16:24:40 -0800 |
---|---|---|
committer | John Bowler <jbowler@acm.org> | 2016-12-26 16:24:40 -0800 |
commit | 8d4110bd618eb03a252b18456c546cef0a8475bb (patch) | |
tree | a7cd17a803bf5eb4bef5b12a1c8570ce545bd5ef | |
parent | 6b7c27341e681ddf74998ecc6be16cf5b143af4a (diff) | |
download | libpng-8d4110bd618eb03a252b18456c546cef0a8475bb.tar.gz |
Remove 'defined' within macro
This removes the use of a macro containing the pre-processor 'defined'
operator. It is unclear whether this is valid; a macro which
"generates" 'defined' is not permitted, but the use of the work
"generates" within the C90 standard seems to imply more than simple
substitution of an expression itself containing a well-formed defined
operation.
Signed-off-by: John Bowler <jbowler@acm.org>
-rw-r--r-- | contrib/libtests/pngvalid.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 9b85c3ef3..330e26393 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -4010,8 +4010,11 @@ check_interlace_type(int const interlace_type) # define do_own_interlace 1 #endif /* WRITE_INTERLACING tests */ -#define CAN_WRITE_INTERLACE\ - PNG_LIBPNG_VER >= 10700 || defined PNG_WRITE_INTERLACING_SUPPORTED +#if PNG_LIBPNG_VER >= 10700 || defined PNG_WRITE_INTERLACING_SUPPORTED +# define CAN_WRITE_INTERLACE 1 +#else +# define CAN_WRITE_INTERLACE 0 +#endif /* Do the same thing for read interlacing; this controls whether read tests do * their own de-interlace or use libpng. |