diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-12-18 11:45:07 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-12-18 11:45:07 +0000 |
| commit | c554ec47dca508a085c4206aea5cc5cadc1311fb (patch) | |
| tree | 6f00b5382e5d13fb72e4174017c8a344b4436902 /plugins/AdvaImg/src/LibPNG/pngconf.h | |
| parent | 040c8cd3bba9c42d5db076c6e612638a9c32a932 (diff) | |
libpng updated to 1.6.15
git-svn-id: http://svn.miranda-ng.org/main/trunk@11507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AdvaImg/src/LibPNG/pngconf.h')
| -rw-r--r-- | plugins/AdvaImg/src/LibPNG/pngconf.h | 6 |
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__))
|