From 4e4e3c34657246755452c2110ff559e6762a68cd Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 24 Aug 2022 00:41:19 +0530 Subject: [PATCH] sfm: Fix redefinition error in 32 bit mingw-w64 environment sincos function is defined by mingw-w64 for both 32 bit and 64 bit environments. Previously, sincos function was hidden for 64 bit mingw-w64 with __MINGW64__ macro. This change also hides the sincos definition for 32 bit mingw-w64 with __MINGW32__ macro. --- modules/sfm/src/libmv_light/libmv/numeric/numeric.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sfm/src/libmv_light/libmv/numeric/numeric.h b/modules/sfm/src/libmv_light/libmv/numeric/numeric.h index dde7e816f..9e7927e0b 100644 --- a/modules/sfm/src/libmv_light/libmv/numeric/numeric.h +++ b/modules/sfm/src/libmv_light/libmv/numeric/numeric.h @@ -33,7 +33,7 @@ #include #include -#if !defined(__MINGW64__) +#if !defined(__MINGW32__) # if defined(_WIN32) || defined(__APPLE__) || \ defined(__FreeBSD__) || defined(__NetBSD__) static void sincos(double x, double *sinx, double *cosx) { @@ -41,7 +41,7 @@ static void sincos(double x, double *sinx, double *cosx) { *cosx = cos(x); } # endif -#endif // !__MINGW64__ +#endif // !__MINGW32__ #if (defined(_WIN32)) && !defined(__MINGW32__) inline long lround(double d) {