From ea8f75b9e894256d8e6159acb87bf9a48a228d75 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 21 Oct 2013 11:11:27 +0000 Subject: [PATCH] Code maintenance for Qt 5: - Added some more includes needed by MinGW-w64 git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6861 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- src/udp/udplayer.cc | 1 + src/util/bdrandom.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/udp/udplayer.cc b/src/udp/udplayer.cc index 514978f..ddf0258 100644 --- a/src/udp/udplayer.cc +++ b/src/udp/udplayer.cc @@ -31,6 +31,7 @@ #include #include #include +#include /*** * #define UDP_ENABLE_BROADCAST 1 diff --git a/src/util/bdrandom.cc b/src/util/bdrandom.cc index bd0e9c6..3d2bc6a 100644 --- a/src/util/bdrandom.cc +++ b/src/util/bdrandom.cc @@ -1,13 +1,14 @@ #include #include #include +#include #include "util/bdrandom.h" uint32_t bdRandom::index = 0 ; std::vector bdRandom::MT(bdRandom::N,0u) ; bdMutex bdRandom::rndMtx ; -#if defined(_WIN32) || defined(__MINGW32__) +#if (defined(_WIN32) || defined(__MINGW32__)) && !defined(WIN_PTHREADS_H) static bool auto_seed = bdRandom::seed( (time(NULL) + ((uint32_t) pthread_self().p)*0x1293fe)^0x18e34a12 ) ; #else #ifdef __APPLE__