Merge pull request #3493 from aws-lumberyard-dev/windowsdecls

Move undefs of problematic Windows defines to PlatformIncl_Windows.h

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>

Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h

@@ -70,3 +70,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
+

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