diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-04-09 15:57:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 15:57:48 +0000 |
| commit | fb2e845179a04cc259f1e66dcc68e023d2ef433a (patch) | |
| tree | e8d2bc1a607ca8b17ed623fa1fa8e88ccd86e61d | |
| parent | 603f48ab99ce76f552f4f6f85d06b8c5b94c698e (diff) | |
| parent | 35f30c5ab8089f38681d2fdd416c00aebef5a7ff (diff) | |
| download | fdk-aac-fb2e845179a04cc259f1e66dcc68e023d2ef433a.tar.gz fdk-aac-fb2e845179a04cc259f1e66dcc68e023d2ef433a.tar.bz2 fdk-aac-fb2e845179a04cc259f1e66dcc68e023d2ef433a.zip | |
am 35f30c5a: Merge "AArch64: Make LONG 4 bytes"
* commit '35f30c5ab8089f38681d2fdd416c00aebef5a7ff':
AArch64: Make LONG 4 bytes
| -rw-r--r-- | libFDK/include/common_fix.h | 4 | ||||
| -rw-r--r-- | libSYS/include/machine_type.h | 6 |
2 files changed, 5 insertions, 5 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) diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h index 4745e43..b328953 100644 --- a/libSYS/include/machine_type.h +++ b/libSYS/include/machine_type.h @@ -154,15 +154,15 @@ amm-info@iis.fraunhofer.de typedef signed int INT; typedef unsigned int UINT; -#ifdef __x86_64__ +#ifdef __LP64__ /* force FDK long-datatypes to 4 byte */ /* jdr: Use defines to avoid type alias problems on 64 bit machines. */ #define LONG INT #define ULONG UINT -#else /* __x86_64__ */ +#else /* __LP64__ */ typedef signed long LONG; typedef unsigned long ULONG; -#endif /* __x86_64__ */ +#endif /* __LP64__ */ typedef signed short SHORT; typedef unsigned short USHORT; typedef signed char SCHAR; |