Move undefs of problematic Windows defines to PlatformIncl_Windows.h

Signed-off-by: Jeremy Ong <jcong@amazon.com>
This commit is contained in:
Jeremy Ong
2021-08-25 14:41:01 -06:00
parent c3e83387db
commit 032366f9c9
3 changed files with 11 additions and 8 deletions
@@ -77,11 +77,4 @@ namespace AZ::Debug
};
} // namespace AZ::Debug
#ifdef USE_PIX
// The pix3 header unfortunately brings in other Windows macros we need to undef
#undef DeleteFile
#undef LoadImage
#undef GetCurrentTime
#endif
#include <AzCore/Debug/Profiler.inl>
@@ -74,3 +74,13 @@
#if defined(GetCommandLine)
#undef GetCommandLine
#endif
#if defined(LoadImage)
#undef LoadImage
#endif
#if defined(DeleteFile)
#undef DeleteFile
#endif
#if defined(GetCurrentTime)
#undef GetCurrentTime
#endif
+1 -1
View File
@@ -361,7 +361,7 @@ public:
else
{
// remove from start up folder
DeleteFile(fullLinkName);
DeleteFileW(fullLinkName);
}
#endif
#if AZ_TRAIT_OS_PLATFORM_APPLE