From d8ed978b2817551ef7bde9931b7d889e2be4ce96 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sat, 21 Jun 2014 21:12:27 +0000 Subject: [PATCH] Merged revision 7410 from v0.5.5 Fixed Windows compile with MinGW 4.8.2 git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7411 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/Common/retroshare_plugin.pri | 2 +- retroshare-gui/src/gui/settings/GlobalRouterStatistics.cpp | 1 + supportlibs/pegmarkdown/GLibFacade.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index 4d2817302..3fca0f211 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -12,7 +12,7 @@ linux-g++-64 { win32 { lessThan(QT_MAJOR_VERSION, 5) { # from Qt 4.7.4 and 4.8+ the mkspecs has changed making dyn libs unusable anymore on windows : QMAKE_LFLAGS = - QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc + QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc } # Switch on extra warnings diff --git a/retroshare-gui/src/gui/settings/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/settings/GlobalRouterStatistics.cpp index 736ab3a18..29309524f 100644 --- a/retroshare-gui/src/gui/settings/GlobalRouterStatistics.cpp +++ b/retroshare-gui/src/gui/settings/GlobalRouterStatistics.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/supportlibs/pegmarkdown/GLibFacade.c b/supportlibs/pegmarkdown/GLibFacade.c index f60c1443b..ab1438814 100644 --- a/supportlibs/pegmarkdown/GLibFacade.c +++ b/supportlibs/pegmarkdown/GLibFacade.c @@ -28,7 +28,7 @@ */ /* Solaris and Windows do not provide vasprintf() or asprintf(). */ -#if defined(__WIN32) || (defined(__SVR4) && defined(__sun)) +#if (defined(__WIN32) && !defined(__MINGW64_VERSION_MAJOR)) || (defined(__SVR4) && defined(__sun)) int vasprintf( char **sptr, char *fmt, va_list argv ) { int wanted = vsnprintf( *sptr = NULL, 0, fmt, argv );