From 726d7c67159034f7e3b1a3dc6ca4a199bd0fdc00 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 15 Nov 2016 10:34:10 -0600
Subject: [PATCH] Fix chfPluginTest for MS 2015 compiler

---
 src/ioc/db/test/chfPluginTest.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ioc/db/test/chfPluginTest.c b/src/ioc/db/test/chfPluginTest.c
index 4b12644ea..becd876e8 100644
--- a/src/ioc/db/test/chfPluginTest.c
+++ b/src/ioc/db/test/chfPluginTest.c
@@ -541,8 +541,11 @@ MAIN(chfPluginTest)
     dbChannel *pch;
     db_field_log *pfl;
 
-#if defined(WIN32) && (!defined(_MINGW) || __MSVCRT_VERSION__ >= 0x0800)
+#ifdef _WIN32
+#if (defined(_MSC_VER) && _MSC_VER < 1900) || \
+    (defined(_MINGW) && defined(_TWO_DIGIT_EXPONENT))
     _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
 #endif
 
     testPlan(1433);