From 3aa5d0fc69474145ef084f71885d1f295df87bc6 Mon Sep 17 00:00:00 2001 From: Daniel Reimer Date: Wed, 10 Jun 2015 12:04:51 +0000 Subject: [PATCH] [GDI32] [USER32] Fix release build. svn path=/trunk/; revision=68102 --- reactos/win32ss/gdi/gdi32/wine/rosglue.c | 6 ++++++ reactos/win32ss/user/user32/windows/font.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/reactos/win32ss/gdi/gdi32/wine/rosglue.c b/reactos/win32ss/gdi/gdi32/wine/rosglue.c index 157977a1528..1b4adadbfd2 100644 --- a/reactos/win32ss/gdi/gdi32/wine/rosglue.c +++ b/reactos/win32ss/gdi/gdi32/wine/rosglue.c @@ -519,6 +519,10 @@ _assert ( DbgRaiseAssertionFailure(); } +#if defined(_MSC_VER) && (DBG != 1) +// MSVC uses it's own in this case. Thus skipping it. +#else + double __cdecl atan2( @@ -529,6 +533,8 @@ atan2( return 0.; } +#endif + /******************************************************************************/ static diff --git a/reactos/win32ss/user/user32/windows/font.c b/reactos/win32ss/user/user32/windows/font.c index 411ca504adb..66f4e1d640a 100644 --- a/reactos/win32ss/user/user32/windows/font.c +++ b/reactos/win32ss/user/user32/windows/font.c @@ -46,6 +46,9 @@ DWORD WINAPI GdiGetCodePage(HDC hdc); #define assert(e) ((e) ? (void)0 : _font_assert(#e, __FILE__, __LINE__)) +#else +#include + #endif void _font_assert(const char *msg, const char *file, int line)