From 7cc0ca9cb1489e12377c31c360224bd1dcb5b1b7 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Mon, 13 Oct 2014 23:22:09 +0200 Subject: [PATCH] win32 getpid --- src/pva/pvaVersion.h | 2 +- src/server/responseHandlers.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pva/pvaVersion.h b/src/pva/pvaVersion.h index 1a2fa3a..5352ff7 100644 --- a/src/pva/pvaVersion.h +++ b/src/pva/pvaVersion.h @@ -25,7 +25,7 @@ // module version // TODO to be generated, etc. #define EPICS_PVA_MAJOR_VERSION 4 -#define EPICS_PVA_MINOR_VERSION 0 +#define EPICS_PVA_MINOR_VERSION 1 #define EPICS_PVA_MAINTENANCE_VERSION 0 #define EPICS_PVA_DEVELOPMENT_FLAG 1 diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp index c9ee498..86dd22b 100644 --- a/src/server/responseHandlers.cpp +++ b/src/server/responseHandlers.cpp @@ -8,6 +8,10 @@ #include #endif +#ifdef _WIN32 +#include +#endif + #include #include @@ -546,6 +550,8 @@ public: std::stringstream sspid; #ifdef __vxworks sspid << taskIdSelf(); +#elif defined(_WIN32) + sspid << _getpid(); #else sspid << getpid(); #endif