Define and use GETPID() macro

This commit is contained in:
Andrew Johnson
2016-04-06 15:19:35 -05:00
parent 962e139c1a
commit 0ad8ece840

View File

@@ -4,19 +4,27 @@
* in file LICENSE that is included with this distribution.
*/
#ifdef __vxworks
#include <taskLib.h>
#endif
#ifdef _WIN32
#if defined(_WIN32) && !defined(NOMINMAX)
#define NOMINMAX
#include <process.h>
#endif
#include <sstream>
#include <time.h>
#include <stdlib.h>
#ifdef _WIN32
#define GETPID() GetCurrentProcessId()
#endif
#ifdef vxWorks
#include <taskLib.h>
#define GETPID() taskIdSelf()
#endif
#ifndef GETPID
#define GETPID() getpid()
#endif
#include <osiSock.h>
#include <osiProcess.h>
@@ -619,13 +627,7 @@ public:
result->getSubFieldT<PVString>("host")->put(hostName);
std::stringstream sspid;
#ifdef __vxworks
sspid << taskIdSelf();
#elif defined(_WIN32)
sspid << _getpid();
#else
sspid << getpid();
#endif
sspid << GETPID();
result->getSubFieldT<PVString>("process")->put(sspid.str());
char timeText[64];