From 032366f9c96deb9f953215e7b3a829ce898f476c Mon Sep 17 00:00:00 2001
From: Jeremy Ong <jcong@amazon.com>
Date: Wed, 25 Aug 2021 14:41:01 -0600
Subject: [PATCH] Move undefs of problematic Windows defines to
 PlatformIncl_Windows.h

Signed-off-by: Jeremy Ong <jcong@amazon.com>
---
 Code/Framework/AzCore/AzCore/Debug/Profiler.h          |  7 -------
 .../Platform/Windows/AzCore/PlatformIncl_Windows.h     | 10 ++++++++++
 Code/Tools/GridHub/GridHub/main.cpp                    |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Code/Framework/AzCore/AzCore/Debug/Profiler.h b/Code/Framework/AzCore/AzCore/Debug/Profiler.h
index c8911a6ac4..8af48e47f6 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Profiler.h
+++ b/Code/Framework/AzCore/AzCore/Debug/Profiler.h
@@ -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>
diff --git a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
index f58e772155..38e1f59fc7 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
@@ -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
+
diff --git a/Code/Tools/GridHub/GridHub/main.cpp b/Code/Tools/GridHub/GridHub/main.cpp
index bfb82efd0d..3b853910be 100644
--- a/Code/Tools/GridHub/GridHub/main.cpp
+++ b/Code/Tools/GridHub/GridHub/main.cpp
@@ -361,7 +361,7 @@ public:
         else
         {
             // remove from start up folder
-            DeleteFile(fullLinkName);
+            DeleteFileW(fullLinkName);
         }
 #endif
 #if AZ_TRAIT_OS_PLATFORM_APPLE