XFA: Unconditionally use static png_gt() in png.c

third_party/libpng16/png.c

 
 /* png.c - location for general purpose libpng functions
  *
  * Last changed in libpng 1.6.19 [November 12, 2015]
  * Copyright (c) 1998-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ skipping 2446 matching lines @@
        * bug is fixed.
        */
       else
          png_error(png_ptr, "internal error handling cHRM->XYZ");
    }
 }
 #endif /* READ_RGB_TO_GRAY */
 
 #endif /* COLORSPACE */
 
-#ifdef __GNUC__

[Nico, 2016/01/19 21:46:23]

other possible fixes:

* Change this line to `#if defined(__GNUC__) || defined(__clang__)` -- clang
defined __GNUC__ in gcc-compat mode, but not in clang-cl mode

* Just disable this warning for this target

[Oliver Chang, 2016/01/19 22:35:46]

Hmm, I think this is still a valuable warning to keep in, in case legitimate
bugs are introduced in the future?

+/* #ifdef __GNUC__ */
+#if 1
 /* This exists solely to work round a warning from GNU C. */
 static int /* PRIVATE */
 png_gt(size_t a, size_t b)
 {
     return a > b;
 }
 #else
 #   define png_gt(a,b) ((a) > (b))
 #endif
 
@@ skipping 2011 matching lines @@
 {
    /* Utility to log an error. */
    png_safecat(image->message, (sizeof image->message), 0, error_message);
    image->warning_or_error |= PNG_IMAGE_ERROR;
    png_image_free(image);
    return 0;
 }
 
 #endif /* SIMPLIFIED READ/WRITE */
 #endif /* READ || WRITE */