Merge pull request #848 from PhenomRetroShare/Fix_WindowsCompil

Fix Windows Compilation

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"

libretroshare/src/services/autoproxy/p3i2pbob.cc

@@ -1,4 +1,5 @@
 #include <sstream>
+#include <unistd.h>		/* 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)

libretroshare/src/services/autoproxy/p3i2pbob.h

@@ -4,8 +4,10 @@
 #include <map>
 #include <queue>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <time.h>
+#ifndef WINDOWS_SYS
+	#include <sys/socket.h>
+#endif
 
 #include "services/autoproxy/rsautoproxymonitor.h"
 #include "util/rsthreads.h"

libretroshare/src/services/autoproxy/rsautoproxymonitor.cc

@@ -1,5 +1,7 @@
 #include "rsautoproxymonitor.h"
 
+#include <unistd.h>		/* 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())