From 351689996dc51c8ac4b153f2bac45cb1b59040d3 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 6 Nov 2010 09:17:04 +0000 Subject: [PATCH] [MINGW] #if 0 _matherr(). We already have it in our crt and it's exported from msvcrt. MSVC doesn't like when it's there twice. svn path=/branches/cmake-bringup/; revision=49506 --- lib/3rdparty/mingw/merr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/3rdparty/mingw/merr.c b/lib/3rdparty/mingw/merr.c index 134e10fae62..d2a55fd9591 100644 --- a/lib/3rdparty/mingw/merr.c +++ b/lib/3rdparty/mingw/merr.c @@ -10,6 +10,7 @@ int __defaultmatherr = 0; +#if 0 int __CRTDECL _matherr (struct _exception *pexcept) { @@ -51,3 +52,4 @@ _matherr (struct _exception *pexcept) return 0; } +#endif