Alexandre Julliard : msvcp90: Work around Mingw duplicate encode/ decode_pointer definition.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6e47b1691b9d5b0d118d0f98a8c71f2487948725
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6e47b1691b9d5b0d118d0f98a8...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Dec 21 12:43:03 2013 +0100

msvcp90: Work around Mingw duplicate encode/decode_pointer definition.

---

 dlls/msvcp90/msvcp_main.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c
index 496efa9..848d5bb 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