diff options
author | Rob Hughes <robert.hughes@arm.com> | 2020-05-20 13:11:37 +0100 |
---|---|---|
committer | Rob Hughes <robert.hughes@arm.com> | 2020-06-02 14:55:00 +0000 |
commit | bc873d2dac4666a86e4844985199dfd90e67be5b (patch) | |
tree | 478688dc9a28b497a13ce7b65ef786d1d8b4547b /src/armnnUtils | |
parent | bb46dde88befe14583eaac83f65775a7543d4586 (diff) | |
download | armnn-bc873d2dac4666a86e4844985199dfd90e67be5b.tar.gz |
Tidy up uses of Windows.h by adding WindowsWrapper.hpp
This header brings in the Win32 API header, with some small modifications
applied to prevent clashes with our code. This means those modifications
don't need to be made in each place that we bring in Windows.h
Change-Id: Ie817c7a167eccbe1ac6a49d3fc940eef8b2f534d
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
Diffstat (limited to 'src/armnnUtils')
-rw-r--r-- | src/armnnUtils/Filesystem.cpp | 3 | ||||
-rw-r--r-- | src/armnnUtils/Processes.cpp | 3 | ||||
-rw-r--r-- | src/armnnUtils/WindowsWrapper.hpp | 17 |
3 files changed, 19 insertions, 4 deletions
diff --git a/src/armnnUtils/Filesystem.cpp b/src/armnnUtils/Filesystem.cpp index 6c8175b202..886d7dad30 100644 --- a/src/armnnUtils/Filesystem.cpp +++ b/src/armnnUtils/Filesystem.cpp @@ -9,8 +9,7 @@ #include <sys/stat.h> #include <stdio.h> #elif defined(_MSC_VER) -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include "WindowsWrapper.hpp" #endif namespace armnnUtils diff --git a/src/armnnUtils/Processes.cpp b/src/armnnUtils/Processes.cpp index 0e43e8cecd..6c216cf440 100644 --- a/src/armnnUtils/Processes.cpp +++ b/src/armnnUtils/Processes.cpp @@ -8,8 +8,7 @@ #if defined(__unix__) #include <unistd.h> #elif defined(_MSC_VER) -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include "WindowsWrapper.hpp" #endif namespace armnnUtils diff --git a/src/armnnUtils/WindowsWrapper.hpp b/src/armnnUtils/WindowsWrapper.hpp new file mode 100644 index 0000000000..7f02cb1a16 --- /dev/null +++ b/src/armnnUtils/WindowsWrapper.hpp @@ -0,0 +1,17 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +// This header brings in the Win32 API header, with some small modifications applied to prevent clashes with our code. + +#if defined(_MSC_VER) + +#define NOMINMAX // Prevent definition of min/max macros that interfere with std::min/max +#define WIN32_LEAN_AND_MEAN +#include <Windows.h> +// Windows.h defines some names that we don't need and interfere with some of our definition +#undef TIME_MS // Instrument.hpp +#undef CreateEvent // ITimelineDecoder.hpp + +#endif |