summaryrefslogtreecommitdiff
path: root/pngpriv.h
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@acm.org>2014-11-03 19:44:39 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-11-03 19:44:39 -0600
commit445475a1660a590111c73a8724c644649df4aebd (patch)
treea9153614b7a4af98c0722ec5478f32361d4e1683 /pngpriv.h
parent2eb712e519275739c82e70f92609576a7812afb3 (diff)
downloadlibpng-445475a1660a590111c73a8724c644649df4aebd.tar.gz
[libpng16] Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
revision to configure.ac to support ARM on aarch64 instead (John Bowler).
Diffstat (limited to 'pngpriv.h')
-rw-r--r--pngpriv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/pngpriv.h b/pngpriv.h
index 08c7d18c6..aa63cfa47 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -6,7 +6,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
- * Last changed in libpng 1.6.15 [(PENDING RELEASE)]]
+ * Last changed in libpng 1.6.10 [March 6, 1014]]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -123,8 +123,8 @@
* Note that gcc-4.9 defines __ARM_NEON instead of __ARM_NEON__, so we
* check both variants.
*/
-# if defined(PNG_USE_ARM_NEON) && (defined(__ARM_NEON__) || \
- defined(__ARM_NEON)) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+# if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
+ defined(PNG_ALIGNED_MEMORY_SUPPORTED)
# define PNG_ARM_NEON_OPT 2
# else
# define PNG_ARM_NEON_OPT 0