diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
| commit | 8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015 (patch) | |
| tree | 220c965bb467b020a4db171d7803586f9ed22cea /mysys/stacktrace.c | |
| parent | ce4b468f7e36717298c16e7bafc562c89798e453 (diff) | |
| parent | e2dff1b5bdd860ae931d3ad6eb78225b81b8060a (diff) | |
| download | mariadb-git-8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015.tar.gz | |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to 'mysys/stacktrace.c')
| -rw-r--r-- | mysys/stacktrace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index 75fda93b56e..7bac8017324 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.c @@ -86,7 +86,9 @@ void my_print_stacktrace(uchar* stack_bottom __attribute__((unused)), #if BACKTRACE_DEMANGLE -char __attribute__ ((weak)) *my_demangle(const char *mangled_name, int *status) +char __attribute__ ((weak)) * +my_demangle(const char *mangled_name __attribute__((unused)), + int *status __attribute__((unused))) { return NULL; } |