summaryrefslogtreecommitdiff
path: root/libavutil/x86
diff options
context:
space:
mode:
authorLoren Merritt <pengvado@akuvian.org>2014-09-05 00:13:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-05 01:41:50 +0200
commita4dbabc8b3c123c071c925d2d749a50e4895ebcd (patch)
tree4bd06f548569ac70e82b7e958c54432bd6520d4d /libavutil/x86
parentc3d2426cca940b519ac654eb36ba04d0acc86ca9 (diff)
x86inc: free up variable name "n" in global namespace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
-rw-r--r--libavutil/x86/x86inc.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index 1cfb05509a..4492b9c3c1 100644
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -821,12 +821,12 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
%assign %%i 0
%rep 8
CAT_XDEFINE m, %%i, mm %+ %%i
- CAT_XDEFINE nmm, %%i, %%i
+ CAT_XDEFINE nnmm, %%i, %%i
%assign %%i %%i+1
%endrep
%rep 8
CAT_UNDEF m, %%i
- CAT_UNDEF nmm, %%i
+ CAT_UNDEF nnmm, %%i
%assign %%i %%i+1
%endrep
INIT_CPUFLAGS %1
@@ -847,7 +847,7 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
%assign %%i 0
%rep num_mmregs
CAT_XDEFINE m, %%i, xmm %+ %%i
- CAT_XDEFINE nxmm, %%i, %%i
+ CAT_XDEFINE nnxmm, %%i, %%i
%assign %%i %%i+1
%endrep
INIT_CPUFLAGS %1
@@ -925,7 +925,7 @@ INIT_XMM
%endrep
%rep %0/2
%xdefine m%1 %%tmp%2
- CAT_XDEFINE n, m%1, %1
+ CAT_XDEFINE nn, m%1, %1
%rotate 2
%endrep
%endmacro
@@ -943,16 +943,16 @@ INIT_XMM
%xdefine %%tmp m%1
%xdefine m%1 m%2
%xdefine m%2 %%tmp
- CAT_XDEFINE n, m%1, %1
- CAT_XDEFINE n, m%2, %2
+ CAT_XDEFINE nn, m%1, %1
+ CAT_XDEFINE nn, m%2, %2
%rotate 1
%endrep
%endmacro
%macro SWAP_INTERNAL_NAME 2-*
- %xdefine %%args n %+ %1
+ %xdefine %%args nn %+ %1
%rep %0-1
- %xdefine %%args %%args, n %+ %2
+ %xdefine %%args %%args, nn %+ %2
%rotate 1
%endrep
SWAP_INTERNAL_NUM %%args
@@ -979,7 +979,7 @@ INIT_XMM
%assign %%i 0
%rep num_mmregs
CAT_XDEFINE m, %%i, %1_m %+ %%i
- CAT_XDEFINE n, m %+ %%i, %%i
+ CAT_XDEFINE nn, m %+ %%i, %%i
%assign %%i %%i+1
%endrep
%endif