diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 13:35:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 13:35:26 +0300 |
| commit | 65c43bcfe276dba545b1985443322fbb07c1a49a (patch) | |
| tree | bc12dd78a956304b954145ca74d32f94499ae533 | |
| parent | d5d8756de3fa640b69793068937c0293587b16ee (diff) | |
| download | mariadb-git-65c43bcfe276dba545b1985443322fbb07c1a49a.tar.gz | |
After-merge fix of the Windows build
| -rw-r--r-- | include/my_stacktrace.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index 27dcd9ff130..20b86f45232 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -42,19 +42,21 @@ C_MODE_START #if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE) -void my_setup_stacktrace(void); 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); void my_write_core(int sig); -#if BACKTRACE_DEMANGLE +# if BACKTRACE_DEMANGLE char *my_demangle(const char *mangled_name, int *status); -#endif /* BACKTRACE_DEMANGLE */ -#ifdef __WIN__ +# endif /* BACKTRACE_DEMANGLE */ +# ifdef __WIN__ +# define my_setup_stacktrace() void my_set_exception_pointers(EXCEPTION_POINTERS *ep); -#endif /* __WIN__ */ +# else +void my_setup_stacktrace(void); +# endif /* __WIN__ */ #else -#define my_setup_stacktrace() +# define my_setup_stacktrace() #endif /* ! (defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)) */ #ifndef _WIN32 |