Prevent defining _GUARD_CHECK_ICALL twice (chakra-core#6974)

* Prevent defining `_GUARD_CHECK_ICALL` twice Newer versions of MVC define _GUARD_CHECK_ICALL after CC defines it
MrShrekThird · Apr 16, 2024 · 2f15d4e · 2f15d4e
1 parent d1cc2b4
commit 2f15d4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/Runtime/Base/ThreadContextInfo.cpp b/lib/Runtime/Base/ThreadContextInfo.cpp
@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 
@@ -21,6 +22,10 @@
 # else
    extern "C" void __fastcall _guard_check_icall(_In_ uintptr_t _Target);
 # endif
+
+# ifndef _GUARD_CHECK_ICALL
+#  define _GUARD_CHECK_ICALL _guard_check_icall
+# endif
 #endif
 
 ThreadContextInfo::ThreadContextInfo() :

diff --git a/lib/Runtime/Base/ThreadContextInfo.h b/lib/Runtime/Base/ThreadContextInfo.h
@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 
@@ -178,7 +179,3 @@ uintptr_t ShiftAddr(const ThreadContextInfo*const context, T* address)
 }
 
 uintptr_t ShiftAddr(const ThreadContextInfo*const context, uintptr_t address);
-
-#ifndef _GUARD_CHECK_ICALL
-#define _GUARD_CHECK_ICALL _guard_check_icall
-#endif