From 6e47b1691b9d5b0d118d0f98a8c71f2487948725 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 21 Dec 2013 12:43:03 +0100 Subject: [PATCH] msvcp90: Work around Mingw duplicate encode/decode_pointer definition. --- dlls/msvcp90/msvcp_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 496efa90f6e..848d5bb6328 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -122,3 +122,8 @@ __int64 * __cdecl std_Fpz_func(void) { return &std_Fpz; } + +#if defined(__MINGW32__) && _MSVCP_VER >= 80 && _MSVCP_VER <= 90 +/* Hack: prevent Mingw from importing mingw_helpers.o which conflicts with encode/decode_pointer */ +int mingw_app_type = 0; +#endif