mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2024-12-12 16:37:34 +01:00
Merge "AArch64: Make LONG 4 bytes"
This commit is contained in:
commit
35f30c5ab8
@ -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)
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user