From 9d74295078dc7d63d3de567e41fba2f7c78a9608 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 2 Aug 2012 11:29:14 +0000 Subject: Follow-up for r161168 for Windows llvm-svn: 161169 --- compiler-rt/lib/interception/interception_win.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'compiler-rt/lib/interception/interception_win.h') diff --git a/compiler-rt/lib/interception/interception_win.h b/compiler-rt/lib/interception/interception_win.h index 9d1586ecb17..c64af1baffe 100644 --- a/compiler-rt/lib/interception/interception_win.h +++ b/compiler-rt/lib/interception/interception_win.h @@ -23,19 +23,22 @@ namespace __interception { // returns true if a function with the given name was found. -bool GetRealFunctionAddress(const char *func_name, void **func_addr); +bool GetRealFunctionAddress(const char *func_name, uptr *func_addr); // returns true if the old function existed, false on failure. -bool OverrideFunction(void *old_func, void *new_func, void **orig_old_func); +bool OverrideFunction(uptr old_func, uptr new_func, uptr *orig_old_func); } // namespace __interception #if defined(_DLL) # define INTERCEPT_FUNCTION_WIN(func) \ - ::__interception::GetRealFunctionAddress(#func, (void**)&REAL(func)) + ::__interception::GetRealFunctionAddress( \ + #func, (::__interception::uptr*)&REAL(func)) #else # define INTERCEPT_FUNCTION_WIN(func) \ - ::__interception::OverrideFunction((void*)func, (void*)WRAP(func), \ - (void**)&REAL(func)) + ::__interception::OverrideFunction( \ + (::__interception::uptr)func, \ + (::__interception::uptr)WRAP(func), \ + (::__interception::uptr*)&REAL(func)) #endif #endif // INTERCEPTION_WIN_H -- cgit v1.2.3