Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-30 09:13:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed code to compile under windows.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-08-05 16:35:07 +00:00
parent 739216f2d2
commit 2dfb95ad13
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/pqi/pqissllistener.cc
View File

@ -180,7 +180,14 @@ int pqissllistenbase::setuplisten()
{ {
int on = 1; int on = 1;
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
#ifndef WINDOWS_SYS // ie UNIX
if (setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) if (setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
#else //WINDOWS_SYS
if (setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (const char *) &on, sizeof(on)) < 0)
#endif
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
{ {
std::ostringstream out; std::ostringstream out;
out << "pqissllistenbase::setuplisten()"; out << "pqissllistenbase::setuplisten()";

30
libretroshare/src/tests/netsetup_test.cc
View File

@ -198,6 +198,28 @@ int main(int argc, char **argv)
} }
#ifndef WINDOWS_SYS
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
#else
// Windows Networking Init.
WORD wVerReq = MAKEWORD(2,2);
WSADATA wsaData;
if (0 != WSAStartup(wVerReq, &wsaData))
{
std::cerr << "Failed to Startup Windows Networking";
std::cerr << std::endl;
}
else
{
std::cerr << "Started Windows Networking";
std::cerr << std::endl;
}
#endif
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
std::string ownId = "OWNID"; std::string ownId = "OWNID";
/* create a dummy auth mgr */ /* create a dummy auth mgr */
@ -241,8 +263,14 @@ int main(int argc, char **argv)
connMgr->tick(); connMgr->tick();
setupTest(i, connMgr); setupTest(i, connMgr);
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
#ifndef WINDOWS_SYS // ie UNIX
sleep(1); sleep(1);
#else
Sleep(1000);
#endif
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
connMgr->tick(); connMgr->tick();
checkResults(i, connMgr); checkResults(i, connMgr);