From 1454f42a2737fd476531a1476653f16ffcf7bb9f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 1 Feb 2018 11:19:08 -0600
Subject: [PATCH 1/2] Config fix for parallel builds with MSVC 2015 and later

From Mark Rivers and Freddie Akeroyd.
---
 configure/os/CONFIG.win32-x86.win32-x86 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86
index 863841923..f5b21cc2e 100644
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -142,6 +142,17 @@ STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
+#
+# option needed for parallel builds with Visual Studio 2015 onward
+#
+# -FS Force Synchronous PDB Writes
+ifneq ($(VisualStudioVersion),)
+  OPT_CXXFLAGS_NO += -FS
+  OPT_CFLAGS_NO += -FS
+endif
+
+
+#
 # add -profile here to run the ms profiler
 # -LTCG whole program optimization
 # -incremental:no full linking

From 734d16291fec37b5517cf15fd134cce0f5c9a4ef Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 1 Feb 2018 09:42:51 -0800
Subject: [PATCH 2/2] rsrv: buffer for IP too small

An IPv4 address and port number
has 21 characters max.
---
 src/rsrv/online_notify.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index 883951dce..b7249870f 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -72,7 +72,7 @@ void rsrv_online_notify_task(void *pParm)
     char                        * pStr;
     int                         autoBeaconAddr;
     ELLLIST                     autoAddrList;
-    char                        buf[16];
+    char                        buf[22];
     unsigned                    priorityOfUDP;
     epicsThreadBooleanStatus    tbs;
     epicsThreadId               tid;