Merge pull request #345 from nnminh171298/patch-1

check if _MSC_VER exists for when mingw is used
dnp3 · Apr 17, 2020 · 23fa25f · 23fa25f
2 parents 15bd56e + d9973f4
commit 23fa25f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,6 +1,7 @@
-### 2.3.4 ###
+### 2.x ###
 * :beetle: Fix conformance issue with data-link confirmations. See PR [#359](https://github.com/dnp3/opendnp3/pull/359).
 * :beetle: Fix conformance issue select & operate behaviour. See PR [#359](https://github.com/dnp3/opendnp3/pull/359).
+* :beetle: Fix issue when compiling with MingW. See PR [#345](https://github.com/dnp3/opendnp3/pull/345).
 
 ### 2.3.3 ###
 * :beetle: Fix C# exception on time conversion upon restart command not supported. See issue [#350](https://github.com/dnp3/opendnp3/issues/350).

diff --git a/cpp/libs/include/asiopal/SteadyClock.h b/cpp/libs/include/asiopal/SteadyClock.h
@@ -26,7 +26,7 @@
 namespace asiopal
 {
 
-#if (defined WIN32 && (_MSC_VER < 1900)) // Windows with VS eariler than 2015, e.g. 2013
+#if (defined WIN32 && defined _MSC_VER && (_MSC_VER < 1900)) // Windows with VS eariler than 2015, e.g. 2013
 
 #include <Windows.h>
 
@@ -77,4 +77,4 @@ typedef std::chrono::steady_clock steady_clock_t;
 
 } // namespace asiopal
 
-#endif
+#endif