msvcp90: Work around Mingw duplicate encode/decode_pointer definition.

2013-12-21 12:43:03 +01:00 · 2013-12-21 12:43:03 +01:00 · 6e47b1691b
parent b6e5496da4
commit 6e47b1691b
1 changed files with 5 additions and 0 deletions
--- 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