diff options
| -rw-r--r-- | include/armnn/Logging.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/armnn/Logging.hpp b/include/armnn/Logging.hpp index be84fadfd6..af6b813c85 100644 --- 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__) |