[libpng16] Changed "if defined(__ARM_NEON__)" to

"if defined(__ARM_NEON__) || defined(__ARM_NEON)" (James Wu).

ANNOUNCE

 
-Libpng 1.6.13beta01 - June 22, 2014
+Libpng 1.6.13beta01 - June 24, 2014
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -26,7 +26,7 @@ Other information:
 
 Changes since the last public release (1.6.13):
 
-Version 1.6.13beta01 [June 22, 2014]
+Version 1.6.13beta01 [June 24, 2014]
   Quieted -Wsign-compare and -Wclobber compiler warnings in
     contrib/pngminus/*.c
   Added "(void) png_ptr;" where needed in contrib/gregbook to quiet
@@ -34,6 +34,8 @@ Version 1.6.13beta01 [June 22, 2014]
   Split a long output string in contrib/gregbook/rpng2-x.c.
   Added "PNG_SET_OPTION" requirement for sRGB chunk support to pnglibconf.dfa,
     Needed for write-only support (John Bowler).
+  Changed "if defined(__ARM_NEON__)" to
+    "if defined(__ARM_NEON__) || defined(__ARM_NEON)" (James Wu).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

@@ -4940,7 +4940,7 @@ Version 1.6.12rc03 [June 8, 2014]
 Version 1.6.12 [June 12, 2014]
   No changes.
 
-Version 1.6.13beta01 [June 22, 2014]
+Version 1.6.13beta01 [June 24, 2014]
   Quieted -Wsign-compare and -Wclobber compiler warnings in
     contrib/pngminus/*.c
   Added "(void) png_ptr;" where needed in contrib/gregbook to quiet
@@ -4948,6 +4948,8 @@ Version 1.6.13beta01 [June 22, 2014]
   Split a long output string in contrib/gregbook/rpng2-x.c.
   Added "PNG_SET_OPTION" requirement for sRGB chunk support to pnglibconf.dfa,
     Needed for write-only support (John Bowler).
+  Changed "if defined(__ARM_NEON__)" to
+    "if defined(__ARM_NEON__) || defined(__ARM_NEON)" (James Wu).
     
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

pngpriv.h

@@ -119,8 +119,12 @@
     * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail
     * to compile with an appropriate #error if ALIGNED_MEMORY has been turned
     * off.
+    *
+    * Note that gcc-4.9 defines __ARM_NEON instead of __ARM_NEON__, so we
+    * check both variants.
     */
-#  if 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
@@ -148,7 +152,7 @@
     * libpng implementation list for incorporation in the next minor release.
     */
 #  ifndef PNG_ARM_NEON_IMPLEMENTATION
-#     ifdef __ARM_NEON__
+#     if defined(__ARM_NEON__) || defined(__ARM_NEON)
 #        if defined(__clang__)
             /* At present it is unknown by the libpng developers which versions
              * of clang support the intrinsics, however some or perhaps all