From 9213e07a7f95b3e634b97a7bba70849badcf2c8a Mon Sep 17 00:00:00 2001 From: Timur Iskhodzhanov Date: Tue, 10 Sep 2013 14:42:15 +0000 Subject: [PATCH] [ASan] Remove the explicit function prototypes for intercepted functions on Windows git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@190411 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/asan/asan_intercepted_functions.h | 36 ----------------------------------- lib/interception/interception.h | 7 +++++-- 2 files changed, 5 insertions(+), 38 deletions(-) diff --git a/lib/asan/asan_intercepted_functions.h b/lib/asan/asan_intercepted_functions.h index 7b19b3dad..de42cd6d5 100644 --- a/lib/asan/asan_intercepted_functions.h +++ b/lib/asan/asan_intercepted_functions.h @@ -14,15 +14,8 @@ #ifndef ASAN_INTERCEPTED_FUNCTIONS_H #define ASAN_INTERCEPTED_FUNCTIONS_H -#include "asan_internal.h" -#include "interception/interception.h" #include "sanitizer_common/sanitizer_platform_interceptors.h" -#include -#include - -using __sanitizer::uptr; - // Use macro to describe if specific function should be // intercepted on a given platform. #if !SANITIZER_WINDOWS @@ -83,33 +76,4 @@ using __sanitizer::uptr; # define ASAN_INTERCEPT___CXA_ATEXIT 0 #endif -# if SANITIZER_WINDOWS -extern "C" { -// Windows threads. -__declspec(dllimport) -void* __stdcall CreateThread(void *sec, uptr st, void* start, - void *arg, DWORD fl, DWORD *id); - -int memcmp(const void *a1, const void *a2, uptr size); -void memmove(void *to, const void *from, uptr size); -void* memset(void *block, int c, uptr size); -void* memcpy(void *to, const void *from, uptr size); -char* strcat(char *to, const char* from); // NOLINT -char* strchr(const char *str, int c); -int strcmp(const char *s1, const char* s2); -char* strcpy(char *to, const char* from); // NOLINT -uptr strlen(const char *s); -uptr wcslen(const wchar_t *s); -char* strncat(char *to, const char* from, uptr size); -int strncmp(const char *s1, const char* s2, uptr size); -char* strncpy(char *to, const char* from, uptr size); -uptr strnlen(const char *s, uptr maxlen); -int atoi(const char *nptr); -long atol(const char *nptr); // NOLINT -long strtol(const char *nptr, char **endptr, int base); // NOLINT -void longjmp(void *env, int value); -double frexp(double x, int *expptr); -} -# endif - #endif // ASAN_INTERCEPTED_FUNCTIONS_H diff --git a/lib/interception/interception.h b/lib/interception/interception.h index d50af3541..cc8d7b0d2 100644 --- a/lib/interception/interception.h +++ b/lib/interception/interception.h @@ -130,7 +130,10 @@ const interpose_substitution substitution_##func_name[] \ # define WRAPPER_NAME(x) "wrap_"#x # define INTERCEPTOR_ATTRIBUTE # endif -# define DECLARE_WRAPPER(ret_type, func, ...) +# define DECLARE_WRAPPER(ret_type, func, ...) \ + extern "C" ret_type func(__VA_ARGS__); +# define DECLARE_WRAPPER_WINAPI(ret_type, func, ...) \ + extern "C" __declspec(dllimport) ret_type __stdcall func(__VA_ARGS__); #else # define WRAP(x) __interceptor_ ## x # define WRAPPER_NAME(x) "__interceptor_" #x @@ -211,7 +214,7 @@ const interpose_substitution substitution_##func_name[] \ namespace __interception { \ FUNC_TYPE(func) PTR_TO_REAL(func); \ } \ - DECLARE_WRAPPER(ret_type, func, __VA_ARGS__) \ + DECLARE_WRAPPER_WINAPI(ret_type, func, __VA_ARGS__) \ extern "C" \ INTERCEPTOR_ATTRIBUTE \ ret_type __stdcall WRAP(func)(__VA_ARGS__) -- 2.11.4.GIT