Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged revision 7410 from v0.5.5

Browse Source 
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
This commit is contained in:
thunder2 2014-06-21 21:12:27 +00:00
parent 1b822f940e
commit d8ed978b28
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Common/retroshare_plugin.pri
View File

@ -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

1
retroshare-gui/src/gui/settings/GlobalRouterStatistics.cpp
View File

@ -23,6 +23,7 @@
#include <QTimer>
#include <QObject>
#include <QFontMetrics>
#include <time.h>
#include <QPainter>
#include <QStylePainter>

2
supportlibs/pegmarkdown/GLibFacade.c
View File

@ -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 );