Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

check if _MSC_VER exists for when mingw is used #345

Merged
merged 1 commit into from
Apr 17, 2020
Merged

check if _MSC_VER exists for when mingw is used #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions cpp/libs/include/asiopal/SteadyClock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -77,4 +77,4 @@ typedef std::chrono::steady_clock steady_clock_t;

} // namespace asiopal

#endif
#endif