[x264-devel] [PATCH 1/6] aarch64: Set a non-conflicting macro name for COEFF_LEVEL_RUN

[Martin Storsjö]

There's already a macro with the name coef_level_run, and apparently
macros are case insensitive.

This should be squashed into "aarch64: Set the function symbol prefix in
a single location".
---
 common/aarch64/quant-a.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/aarch64/quant-a.S b/common/aarch64/quant-a.S
index f94a0a0..1f70c77 100644
--- a/common/aarch64/quant-a.S
+++ b/common/aarch64/quant-a.S
@@ -533,7 +533,7 @@ function coeff_level_run4_aarch64, export=1
     ret
 endfunc
 
-.macro COEFF_LEVEL_RUN size
+.macro X264_COEFF_LEVEL_RUN size
 function coeff_level_run\size\()_neon, export=1
 .if \size == 15
     sub         x0,  x0,  #2
@@ -562,9 +562,9 @@ function coeff_level_run\size\()_neon, export=1
 endfunc
 .endm
 
-COEFF_LEVEL_RUN 8
-COEFF_LEVEL_RUN 15
-COEFF_LEVEL_RUN 16
+X264_COEFF_LEVEL_RUN 8
+X264_COEFF_LEVEL_RUN 15
+X264_COEFF_LEVEL_RUN 16
 
 function denoise_dct_neon, export=1
 1:  subs        w3,  w3,  #16
-- 
2.7.4