Fix issues due to #include Windows.h

Change-Id: I9d77b5ad6cd81e87217da0c47788a43834c3ac28
Signed-off-by: Robert Hughes <robert.hughes@arm.com>

diff --git a/include/armnn/Logging.hpp b/include/armnn/Logging.hpp
index be84fad..af6b813 100644 (file)
--- a/include/armnn/Logging.hpp
+++ b/include/armnn/Logging.hpp
@@ -11,7 +11,11 @@
 
 
 #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
 #endif
 
 #if defined(__ANDROID__)