# This is the root for the dynamic backend tests to search for dynamic
# backends. By default it will be the project build directory.
-add_definitions('-DDYNAMIC_BACKEND_BUILD_DIR="${PROJECT_BINARY_DIR}"')
+add_definitions(-DDYNAMIC_BACKEND_BUILD_DIR="${PROJECT_BINARY_DIR}")
# ArmNN dynamic backend
if(DYNAMIC_BACKEND_PATHS)
#if defined(__unix__) || defined(__APPLE__)
#include <unistd.h>
#include <fcntl.h>
-#include <common/include/Conversion.hpp>
-#endif
-
-#if defined(__APPLE__) || defined(_MSC_VER) || defined(__MINGW32__)
-#include <common/include/IgnoreUnused.hpp>
#endif
-#if defined(__MINGW32__)
#include <common/include/Conversion.hpp>
+#include <common/include/IgnoreUnused.hpp>
#include <common/include/NumericCast.hpp>
-#endif
namespace arm
{
#include <armnn/utility/Assert.hpp>
#if defined(_MSC_VER)
-#include <commons/include/WindowsWrapper.hpp>
+#include <common/include/WindowsWrapper.hpp>
#endif
#if defined(__ANDROID__)
#include <boost/iostreams/filtering_stream.hpp>
#include <boost/iostreams/tee.hpp>
#include <iostream>
-#include <commons/include/WindowsWrapper.hpp>
+#include <common/include/WindowsWrapper.hpp>
using namespace boost::iostreams;
using namespace std;
#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;
#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
#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>