158158#endif
159159
160160#if defined(__COMPILER_MSVC_)
161- #define __RETURN_ADDR_PTR () _AddressOfReturnAddress()
161+ #define __RETURN_ADDR_PTR_ () _AddressOfReturnAddress()
162162#elif defined(__COMPILER_CLANG_) || defined(__COMPILER_GCC_)
163163namespace __STACK_FRAGILE__
164164{
@@ -220,7 +220,7 @@ namespace __STACK_FRAGILE__
220220 }
221221}
222222
223- #define __RETURN_ADDR_PTR () \
223+ #define __RETURN_ADDR_PTR_ () \
224224 __STACK_FRAGILE__::__get_return_address_ptr ()
225225
226226#endif
@@ -300,7 +300,7 @@ enum class LastThreadStatus : UINT8
300300/* See the API section in README.md */
301301
302302#define OBFUSCATE_FUNCTION __StackObfuscator::detail::ObfuscateFunction \
303- __obfuscate__ (__RETURN_ADDR_PTR ())
303+ __obfuscate__ (__RETURN_ADDR_PTR_ ())
304304
305305/* Better practice to use the other macros instead. */
306306#define OBFUSCATE_CALL (ret_type, convention, name ) \
@@ -829,7 +829,7 @@ namespace __StackObfuscator
829829
830830 template <CallingConvention cc, typename RetType, typename Callable, typename ... Args>
831831 __NO_CFG_ __NO_STACK_PROTECT_
832- RetType ShellCodeManager (Callable * f, Args&&... args) noexcept
832+ RetType ShellCodeManager (Calla__RETURN_ADDR_PTR_ble * f, Args&&... args) noexcept
833833 {
834834 OBFUSCATE_FUNCTION;
835835
@@ -843,7 +843,7 @@ namespace __StackObfuscator
843843 return RetType ();
844844 }
845845
846- void * __RESTRICT_ ret_addr = __RETURN_ADDR_PTR ();
846+ void * __RESTRICT_ ret_addr = __RETURN_ADDR_PTR_ ();
847847 __MEMORY_BARRIER_ ();
848848 uintptr_t tmp = *(uintptr_t *)ret_addr ^ xor_key;
849849 __MEMORY_BARRIER_ ();
0 commit comments