diff options
| author | Rob Hughes <robert.hughes@arm.com> | 2020-08-17 15:47:20 +0100 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2020-08-17 17:35:13 +0000 |
| commit | 35c31c04a9805082be32474211dcd62b7629ed2b (patch) | |
| tree | 69acbe73bb18a235d34e3acf256f84b3633f595a /src/armnnUtils | |
| parent | ec01fb79f15de76f41bd74fac09c2ffb25b7ada6 (diff) | |
| download | armnn-35c31c04a9805082be32474211dcd62b7629ed2b.tar.gz | |
Fix Windows build
Change-Id: I145d220c73313e31c184b6a75ab7f4823df99919
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
Diffstat (limited to 'src/armnnUtils')
| -rw-r--r-- | src/armnnUtils/Filesystem.hpp | 5 | ||||
| -rw-r--r-- | src/armnnUtils/Processes.cpp | 2 | ||||
| -rw-r--r-- | src/armnnUtils/Threads.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/armnnUtils/Filesystem.hpp b/src/armnnUtils/Filesystem.hpp index 3d93ce610d..ba0d97a272 100644 --- a/src/armnnUtils/Filesystem.hpp +++ b/src/armnnUtils/Filesystem.hpp @@ -5,6 +5,11 @@ #pragma once +#if defined(_MSC_VER) +// ghc includes Windows.h directly, bringing in macros that we don't want (e.g. min/max). +// By including Windows.h ourselves first (with appropriate options), we prevent this. +#include <common/include/WindowsWrapper.hpp> +#endif #include <ghc/filesystem.hpp> namespace fs = ghc::filesystem; diff --git a/src/armnnUtils/Processes.cpp b/src/armnnUtils/Processes.cpp index eb68dd9dff..8b401d4145 100644 --- a/src/armnnUtils/Processes.cpp +++ b/src/armnnUtils/Processes.cpp @@ -8,7 +8,7 @@ #if defined(__unix__) || defined(__APPLE__) #include <unistd.h> #elif defined(_MSC_VER) -#include <commons/include/WindowsWrapper.hpp> +#include <common/include/WindowsWrapper.hpp> #endif namespace armnnUtils diff --git a/src/armnnUtils/Threads.cpp b/src/armnnUtils/Threads.cpp index 3ee8174d01..64a84812d2 100644 --- a/src/armnnUtils/Threads.cpp +++ b/src/armnnUtils/Threads.cpp @@ -10,7 +10,7 @@ #include <sys/syscall.h> #define gettid() syscall(SYS_gettid) #elif defined(_MSC_VER) -#include <commons/include/WindowsWrapper.hpp> +#include <common/include/WindowsWrapper.hpp> #elif defined(__APPLE__) #include "AvailabilityMacros.h" #include <sys/syscall.h> |