diff options
| author | Rob Hughes <robert.hughes@arm.com> | 2020-01-09 10:59:34 +0000 |
|---|---|---|
| committer | Rob Hughes <robert.hughes@arm.com> | 2020-01-09 16:37:55 +0000 |
| commit | 4b96a2744d05c848522dd59b10660ecbbcc334e4 (patch) | |
| tree | a8812422e8a43b36a7bffccd1d939013e0ad189b | |
| parent | 122f32516b0aca5c6532ae4782ad621a0aa52592 (diff) | |
| download | armnn-4b96a2744d05c848522dd59b10660ecbbcc334e4.tar.gz | |
Fix issues due to #include Windows.h
Change-Id: I9d77b5ad6cd81e87217da0c47788a43834c3ac28
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
| -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__) |