mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-06-05 22:39:13 +02:00
AArch64: Make LONG 4 bytes
The libSYS/include/machine_type.h header file states LONG should be "Data type representing 4 byte signed integer on all supported platforms" but only provided for defining LONG as INT and ULONG as UINT when __x86_64__ was defined. This has been changed to when __LP64__ is defined, so that it also applies to AArch64. The change to libFDK/include/common_fix.h is then needed to get the project to compile. Change-Id: Iea42d7eca97dcc9da772a05b207d134cb999a72a Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
This commit is contained in:
committed by
Ashok Bhat
parent
fa3eba1644
commit
f2f96fb86d
@@ -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)
|
||||
|
Reference in New Issue
Block a user