summaryrefslogtreecommitdiff
path: root/plugins/AdvaImg/src/LibPNG/pngconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/AdvaImg/src/LibPNG/pngconf.h')
-rw-r--r--plugins/AdvaImg/src/LibPNG/pngconf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/AdvaImg/src/LibPNG/pngconf.h b/plugins/AdvaImg/src/LibPNG/pngconf.h
index f11192fa70..db9ed4839d 100644
--- a/plugins/AdvaImg/src/LibPNG/pngconf.h
+++ b/plugins/AdvaImg/src/LibPNG/pngconf.h
@@ -1,9 +1,9 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.10 - March 6, 2014
+ * libpng version 1.6.15,November 20, 2014
*
- * Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2014 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.)
*
@@ -361,7 +361,7 @@
* version 1.2.41. Disabling these removes the warnings but may also produce
* less efficient code.
*/
-# if defined(__clang__)
+# if defined(__clang__) && defined(__has_attribute)
/* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
# if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
# define PNG_USE_RESULT __attribute__((__warn_unused_result__))