From 651ff34d8d35fb6a3b75471d54b271852f5924cc Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Sep 2018 10:44:32 +0300 Subject: 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. --- libFDK/include/common_fix.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libFDK/include/common_fix.h b/libFDK/include/common_fix.h index 8d0dfde..7c08225 100644 --- a/libFDK/include/common_fix.h +++ b/libFDK/include/common_fix.h @@ -406,10 +406,6 @@ FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b) { return fixmax_S(a, b); } #if !defined(__LP64__) 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); } -#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 inline UINT fMax(UINT a, UINT b) { return fixmax_UI(a, b); } -- cgit v1.2.3