diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 06:00:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 06:00:36 +0300 |
| commit | bfba2bce6a350e2893c76e42415ac733c39a3976 (patch) | |
| tree | 755c71d2936863d0d59be892902fd481e5207691 /include | |
| parent | 309302a3dad5f06cb62b0846dcb8a3671d91ff29 (diff) | |
| parent | ece0b0623c9c14a2a1de61c53be9e1bcc2b6216c (diff) | |
| download | mariadb-git-bfba2bce6a350e2893c76e42415ac733c39a3976.tar.gz | |
Merge 10.1 into 10.2
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 6aaf6728c72..6eb6359cf2d 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -43,7 +43,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); int my_safe_print_str(const char* val, int max_len); void my_write_core(int sig); @@ -53,8 +52,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 |