diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
commit | de0e7cd72a6e071aba686178a8ff461dd5a757f5 (patch) | |
tree | 9beb054fb01d917e1359b60debce629056c6ef4b /include | |
parent | 90c8d773ed0ea7de5e735e836e1e33a190711f17 (diff) | |
parent | a79c25789474f32097e083d3b4953927c04909bc (diff) | |
download | mariadb-git-de0e7cd72a6e071aba686178a8ff461dd5a757f5.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'include')
-rw-r--r-- | include/my_stacktrace.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index 922a59c196a..015fa062752 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -41,7 +41,6 @@ C_MODE_START #if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE) -void my_init_stacktrace(); void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack, my_bool silent); int my_safe_print_str(const char* val, size_t max_len); @@ -52,8 +51,6 @@ char *my_demangle(const char *mangled_name, int *status); #ifdef __WIN__ void my_set_exception_pointers(EXCEPTION_POINTERS *ep); #endif /* __WIN__ */ -#else -#define my_init_stacktrace() do { } while(0) #endif /* ! (defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)) */ #ifndef _WIN32 |