Move undefs of problematic Windows defines to PlatformIncl_Windows.h

Signed-off-by: Jeremy Ong <jcong@amazon.com>
monroegm-disable-blank-issue-2
Jeremy Ong 4 years ago
parent c3e83387db
commit 032366f9c9

@ -77,11 +77,4 @@ namespace AZ::Debug
}; };
} // 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> #include <AzCore/Debug/Profiler.inl>

@ -74,3 +74,13 @@
#if defined(GetCommandLine) #if defined(GetCommandLine)
#undef GetCommandLine #undef GetCommandLine
#endif #endif
#if defined(LoadImage)
#undef LoadImage
#endif
#if defined(DeleteFile)
#undef DeleteFile
#endif
#if defined(GetCurrentTime)
#undef GetCurrentTime
#endif

@ -361,7 +361,7 @@ public:
else else
{ {
// remove from start up folder // remove from start up folder
DeleteFile(fullLinkName); DeleteFileW(fullLinkName);
} }
#endif #endif
#if AZ_TRAIT_OS_PLATFORM_APPLE #if AZ_TRAIT_OS_PLATFORM_APPLE

Loading…
Cancel
Save