diff --git a/appveyor.yml b/appveyor.yml index 0e2b5c8c0..352df8915 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -97,6 +97,7 @@ install: # Install toolchain #- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain" #Already installed # Install other binutils + - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-curl mingw-w64-x86_64-curl" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-miniupnpc mingw-w64-x86_64-miniupnpc" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-sqlite3 mingw-w64-x86_64-sqlite3" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-speex mingw-w64-x86_64-speex" diff --git a/libretroshare/src/services/autoproxy/p3i2pbob.cc b/libretroshare/src/services/autoproxy/p3i2pbob.cc index 5d3c4c6c0..5b7f9f8ed 100644 --- a/libretroshare/src/services/autoproxy/p3i2pbob.cc +++ b/libretroshare/src/services/autoproxy/p3i2pbob.cc @@ -1,4 +1,5 @@ #include +#include /* for usleep() */ #include "p3i2pbob.h" @@ -38,11 +39,7 @@ static struct RsLog::logInfo i2pBobLogInfo = {RsLog::Debug_All, "p3I2pBob"}; static const time_t selfCheckPeroid = 30; void doSleep(useconds_t timeToSleepMS) { -#ifndef WINDOWS_SYS usleep((useconds_t) (timeToSleepMS * 1000)); -#else - Sleep((int) (timeToSleepMS)); -#endif } p3I2pBob::p3I2pBob(p3PeerMgr *peerMgr) diff --git a/libretroshare/src/services/autoproxy/p3i2pbob.h b/libretroshare/src/services/autoproxy/p3i2pbob.h index b86ae5507..bd88c2e86 100644 --- a/libretroshare/src/services/autoproxy/p3i2pbob.h +++ b/libretroshare/src/services/autoproxy/p3i2pbob.h @@ -4,8 +4,10 @@ #include #include #include -#include #include +#ifndef WINDOWS_SYS + #include +#endif #include "services/autoproxy/rsautoproxymonitor.h" #include "util/rsthreads.h" diff --git a/libretroshare/src/services/autoproxy/rsautoproxymonitor.cc b/libretroshare/src/services/autoproxy/rsautoproxymonitor.cc index 87e058f3a..0f5eb22d5 100644 --- a/libretroshare/src/services/autoproxy/rsautoproxymonitor.cc +++ b/libretroshare/src/services/autoproxy/rsautoproxymonitor.cc @@ -1,5 +1,7 @@ #include "rsautoproxymonitor.h" +#include /* for usleep() */ + rsAutoProxyMonitor *rsAutoProxyMonitor::mInstance = NULL; rsAutoProxyMonitor::rsAutoProxyMonitor() @@ -91,11 +93,7 @@ void rsAutoProxyMonitor::stopAllRSShutdown() // wait for shutdown of all services uint32_t t = 0, timeout = 15; do { -#ifndef WINDOWS_SYS usleep(1000 * 1000); -#else - Sleep(1000); -#endif RS_STACK_MUTEX(mLock); std::cout << "(II) waiting for auto proxy service(s) to shut down " << t << "/" << timeout << " (remaining: " << mProxies.size() << ")" << std::endl; if (mProxies.empty())