diff --git a/pngrutil.c b/pngrutil.c
index 9313e4ba2..c34da5d4c 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -4108,9 +4108,7 @@ png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
          png_zstream_error(png_ptr, ret);
 
          if (output != NULL)
-         {
-               png_chunk_error(png_ptr, png_ptr->zstream.msg);
-         }
+            png_chunk_error(png_ptr, png_ptr->zstream.msg);
 
          else /* checking */
          {
diff --git a/pngtest.c b/pngtest.c
index eaf279807..5460c8de3 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -989,7 +989,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       /* Turn off CRC checking while reading */
       png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
 
-#ifdef PNG_IGNORE_ADLER32_SUPPORTED
+#ifdef PNG_IGNORE_ADLER32
       /* Turn off ADLER32 checking while reading */
       png_set_option(read_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON);
 #endif