diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 12:52:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 12:52:44 +0300 |
| commit | d5d8756de3fa640b69793068937c0293587b16ee (patch) | |
| tree | 6fa32a78ae8bed380cee057f1f098633fde47df5 /include | |
| parent | b205e478a3ba7dfce69bba9e6187d412823b4949 (diff) | |
| parent | 2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154 (diff) | |
| download | mariadb-git-d5d8756de3fa640b69793068937c0293587b16ee.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_stacktrace.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index 63e97dbc4f2..27dcd9ff130 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -1,5 +1,6 @@ /* Copyright (c) 2001, 2011, Oracle and/or its affiliates. + Copyright (c) 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +42,7 @@ C_MODE_START #if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE) -void my_init_stacktrace(int setup_handlers); +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); @@ -53,7 +54,7 @@ char *my_demangle(const char *mangled_name, int *status); void my_set_exception_pointers(EXCEPTION_POINTERS *ep); #endif /* __WIN__ */ #else -#define my_init_stacktrace(A) do { } while(0) +#define my_setup_stacktrace() #endif /* ! (defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)) */ #ifndef _WIN32 |