diff options
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/Logging.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/test/UnitTests.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/armnn/Logging.cpp b/src/armnn/Logging.cpp index a3ca7ce118..6db4afaf49 100644 --- a/src/armnn/Logging.cpp +++ b/src/armnn/Logging.cpp @@ -9,11 +9,7 @@ #include <armnn/utility/Assert.hpp> #if defined(_MSC_VER) -#ifndef NOMINMAX -#define NOMINMAX // Prevent definition of min/max macros that interfere with std::min/max -#endif -#include <Windows.h> -#undef TIME_MS // Windows.h defines this but we don't need it and it interferes with our definition in Instrument.hpp +#include <WindowsWrapper.hpp> #endif #if defined(__ANDROID__) diff --git a/src/armnn/test/UnitTests.cpp b/src/armnn/test/UnitTests.cpp index 071bff0ed8..d66a847512 100644 --- a/src/armnn/test/UnitTests.cpp +++ b/src/armnn/test/UnitTests.cpp @@ -24,7 +24,7 @@ BOOST_GLOBAL_FIXTURE(ConfigureLoggingFixture); #include <boost/iostreams/filtering_stream.hpp> #include <boost/iostreams/tee.hpp> #include <iostream> -#include <Windows.h> +#include <WindowsWrapper.hpp> using namespace boost::iostreams; using namespace std; |