From c126f7a1a2e2f20583201f2b783863ba83381887 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 28 May 2018 10:17:56 -0700
Subject: [PATCH] fixups

---
 configure/CONFIG_SITE | 3 +++
 pdbApp/tpool.h        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 26e8c16..518bf61 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -38,5 +38,8 @@ CHECK_RELEASE = YES
 # we don't actually use 'rset' explicitly, but quiet some warnings
 USR_CPPFLAGS += -DUSE_TYPED_RSET
 
+# we use std::min()/max() and don't want conflicting MSVC defs
+USR_CPPFLAGS_WIN32 += -DNOMINMAX
+
 -include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local
diff --git a/pdbApp/tpool.h b/pdbApp/tpool.h
index b50a244..d855834 100644
--- a/pdbApp/tpool.h
+++ b/pdbApp/tpool.h
@@ -4,6 +4,7 @@
 #include <stdexcept>
 #include <deque>
 #include <vector>
+#include <string>
 
 #include <errlog.h>
 #include <epicsThread.h>