aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-04-09 15:49:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-09 15:49:10 +0000
commit35f30c5ab8089f38681d2fdd416c00aebef5a7ff (patch)
tree2a0df3c0e70e33af5462bf46f1ddc3ba103d5fe1 /libFDK/include
parent3252951f61e011241ce6dd8fff775fe9b9aed97f (diff)
parentf2f96fb86d42396716b3e556da7a930956e712fb (diff)
downloadfdk-aac-35f30c5ab8089f38681d2fdd416c00aebef5a7ff.tar.gz
fdk-aac-35f30c5ab8089f38681d2fdd416c00aebef5a7ff.tar.bz2
fdk-aac-35f30c5ab8089f38681d2fdd416c00aebef5a7ff.zip
Merge "AArch64: Make LONG 4 bytes"
Diffstat (limited to 'libFDK/include')
-rw-r--r--libFDK/include/common_fix.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libFDK/include/common_fix.h b/libFDK/include/common_fix.h
index 79c87ac..d2d11f4 100644
--- a/libFDK/include/common_fix.h
+++ b/libFDK/include/common_fix.h
@@ -226,7 +226,7 @@ FDK_INLINE FIXP_SGL fAbs(FIXP_SGL x)
{ return fixabs_S(x); }
/* workaround for TI C6x compiler but not for TI ARM9E compiler */
-#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__)
+#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__LP64__)
FDK_INLINE INT fAbs(INT x)
{ return fixabs_I(x); }
#endif
@@ -336,7 +336,7 @@ FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b)
{ return fixmax_S(a,b); }
/* workaround for TI C6x compiler but not for TI ARM9E */
-#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__)) || (FIX_FRACT == 1)
+#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__LP64__)) || (FIX_FRACT == 1)
FDK_INLINE INT fMax(INT a, INT b)
{ return fixmax_I(a,b); }
FDK_INLINE INT fMin(INT a, INT b)