From 0ad8ece84016667b456098d94e8f92903de1305e Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 6 Apr 2016 15:19:35 -0500
Subject: [PATCH] Define and use GETPID() macro

---
 src/server/responseHandlers.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp
index 5dfd2d6..7463a0c 100644
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -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];