merge w/o version inc

This commit is contained in:
Matej Sekoranja
2014-10-14 14:09:26 +02:00
4 changed files with 146 additions and 31 deletions
+6
View File
@@ -8,6 +8,10 @@
#include <taskLib.h>
#endif
#ifdef _WIN32
#include <process.h>
#endif
#include <sstream>
#include <pv/responseHandlers.h>
@@ -546,6 +550,8 @@ public:
std::stringstream sspid;
#ifdef __vxworks
sspid << taskIdSelf();
#elif defined(_WIN32)
sspid << _getpid();
#else
sspid << getpid();
#endif
+1
View File
@@ -43,6 +43,7 @@ InetAddrVector* getBroadcastAddresses(SOCKET sock,
{
osiSockAddrNode * sn = (osiSockAddrNode *)n;
sn->addr.ia.sin_port = htons(defaultPort);
// TODO discover possible duplicates
v->push_back(sn->addr);
}
ellFree(&as);