Skip to content

Commit 4e4e3c3

Browse files
authored
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.
1 parent d85887c commit 4e4e3c3

File tree

1 file changed

+2
-2
lines changed
  • modules/sfm/src/libmv_light/libmv/numeric

1 file changed

+2
-2
lines changed

modules/sfm/src/libmv_light/libmv/numeric/numeric.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
#include <Eigen/QR>
3434
#include <Eigen/SVD>
3535

36-
#if !defined(__MINGW64__)
36+
#if !defined(__MINGW32__)
3737
# if defined(_WIN32) || defined(__APPLE__) || \
3838
defined(__FreeBSD__) || defined(__NetBSD__)
3939
static void sincos(double x, double *sinx, double *cosx) {
4040
*sinx = sin(x);
4141
*cosx = cos(x);
4242
}
4343
# endif
44-
#endif // !__MINGW64__
44+
#endif // !__MINGW32__
4545

4646
#if (defined(_WIN32)) && !defined(__MINGW32__)
4747
inline long lround(double d) {

0 commit comments

Comments
 (0)