fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove a duplicate definition of fMax/fMin for x86_64 mingw 

FIXP_SGL is a typedef for SHORT, so these extra definitions (which
only were enabled on x86_64 mingw) were duplicates with the fMin/fMax
functions defined for FIXP_SGL right above.
This commit is contained in:
Martin Storsjo 2018-09-03 10:44:32 +03:00
parent 9cd3040ff9
commit 1a9100c1b7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libFDK/include/common_fix.h
View File

@ -406,10 +406,6 @@ FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b) { return fixmax_S(a, b); }
#if !defined(__LP64__) #if !defined(__LP64__)
FDK_INLINE INT fMax(INT a, INT b) { return fixmax_I(a, b); } FDK_INLINE INT fMax(INT a, INT b) { return fixmax_I(a, b); }
FDK_INLINE INT fMin(INT a, INT b) { return fixmin_I(a, b); } FDK_INLINE INT fMin(INT a, INT b) { return fixmin_I(a, b); }
#if !defined(_MSC_VER) && defined(__x86_64__)
FDK_INLINE SHORT fMax(SHORT a, SHORT b) { return fixmax_S(a, b); }
FDK_INLINE SHORT fMin(SHORT a, SHORT b) { return fixmin_S(a, b); }
#endif
#endif #endif
inline UINT fMax(UINT a, UINT b) { return fixmax_UI(a, b); } inline UINT fMax(UINT a, UINT b) { return fixmax_UI(a, b); }