unify uses of __ARM_NEON__ and __ARM_NEON

diff --git a/arch/aarch64/adler32_neon.c b/arch/aarch64/adler32_neon.c
index 9e5fae2c0562401c49556c1f12265164fa632908..8d845a48dd83606418bd321dba8673b2d8217f8f 100644 (file)
--- a/arch/aarch64/adler32_neon.c
+++ b/arch/aarch64/adler32_neon.c
@@ -17,7 +17,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 #include "adler32_neon.h"
-#if (defined(__ARM_NEON__) || defined(__ARM_NEON))
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 #include <arm_neon.h>
 
 static void NEON_accum32(uint32_t *s, const unsigned char *buf, size_t len) {

diff --git a/arch/aarch64/adler32_neon.h b/arch/aarch64/adler32_neon.h
index 6e32c3b2177aa93ada66ee3bb752ff25dd835077..1cb278c7c8fdfa8098273392e838f09fccc1a30f 100644 (file)
--- a/arch/aarch64/adler32_neon.h
+++ b/arch/aarch64/adler32_neon.h
@@ -19,7 +19,7 @@
 #ifndef __ADLER32_NEON__
 #define __ADLER32_NEON__
 
-#if (defined(__ARM_NEON__) || defined(__ARM_NEON))
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 // Depending on the compiler flavor, size_t may be defined in one or the other header. See:
 // http://stackoverflow.com/questions/26410466/gcc-linaro-compiler-throws-error-unknown-type-name-size-t
 #include <stdint.h>

diff --git a/arch/aarch64/fill_window_arm.c b/arch/aarch64/fill_window_arm.c
index 3df6d639784fd08869108486da4a9add972f3418..c9f042a0d110cdd1db93e0662a4a78ef2d48c2c4 100644 (file)
--- a/arch/aarch64/fill_window_arm.c
+++ b/arch/aarch64/fill_window_arm.c
@@ -17,7 +17,7 @@
 
 extern ZLIB_INTERNAL int read_buf(PREFIX3(stream) *strm, unsigned char *buf, unsigned size);
 
-#if __ARM_NEON
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 #include <arm_neon.h>
 
 /* SIMD version of hash_chain rebase */

diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c
index 9e5fae2c0562401c49556c1f12265164fa632908..8d845a48dd83606418bd321dba8673b2d8217f8f 100644 (file)
--- a/arch/arm/adler32_neon.c
+++ b/arch/arm/adler32_neon.c
@@ -17,7 +17,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 #include "adler32_neon.h"
-#if (defined(__ARM_NEON__) || defined(__ARM_NEON))
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 #include <arm_neon.h>
 
 static void NEON_accum32(uint32_t *s, const unsigned char *buf, size_t len) {

diff --git a/arch/arm/adler32_neon.h b/arch/arm/adler32_neon.h
index 6e32c3b2177aa93ada66ee3bb752ff25dd835077..1cb278c7c8fdfa8098273392e838f09fccc1a30f 100644 (file)
--- a/arch/arm/adler32_neon.h
+++ b/arch/arm/adler32_neon.h
@@ -19,7 +19,7 @@
 #ifndef __ADLER32_NEON__
 #define __ADLER32_NEON__
 
-#if (defined(__ARM_NEON__) || defined(__ARM_NEON))
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 // Depending on the compiler flavor, size_t may be defined in one or the other header. See:
 // http://stackoverflow.com/questions/26410466/gcc-linaro-compiler-throws-error-unknown-type-name-size-t
 #include <stdint.h>

diff --git a/arch/arm/fill_window_arm.c b/arch/arm/fill_window_arm.c
index 8065e4174d88e730634d47f22804b11041a315c3..c9f042a0d110cdd1db93e0662a4a78ef2d48c2c4 100644 (file)
--- a/arch/arm/fill_window_arm.c
+++ b/arch/arm/fill_window_arm.c
@@ -17,7 +17,7 @@
 
 extern ZLIB_INTERNAL int read_buf(PREFIX3(stream) *strm, unsigned char *buf, unsigned size);
 
-#if __ARM_NEON__
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 #include <arm_neon.h>
 
 /* SIMD version of hash_chain rebase */

diff --git a/functable.c b/functable.c
index e5dfad84d69cffb572538a4dbedf08b6325decfb..ca5d0cfd369a61fbe8317495a1b7cc012b39cfdc 100644 (file)
--- a/functable.c
+++ b/functable.c
@@ -26,7 +26,7 @@ extern void fill_window_arm(deflate_state *s);
 
 /* adler32 */
 extern uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_t len);
-#if ((defined(__ARM_NEON__) || defined(__ARM_NEON)) && defined(ARM_NEON_ADLER32))
+#if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && defined(ARM_NEON_ADLER32)
 extern uint32_t adler32_neon(uint32_t adler, const unsigned char *buf, size_t len);
 #endif
 
@@ -88,7 +88,7 @@ ZLIB_INTERNAL uint32_t adler32_stub(uint32_t adler, const unsigned char *buf, si
     // Initialize default
     functable.adler32=&adler32_c;
 
-    #if ((defined(__ARM_NEON__) || defined(__ARM_NEON)) && defined(ARM_NEON_ADLER32))
+    #if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && defined(ARM_NEON_ADLER32)
     if (arm_cpu_has_neon)
         functable.adler32=&adler32_neon;
     #endif