From 34b6835722544ff2b49b11e2c7e085ac9fb0e3d7 Mon Sep 17 00:00:00 2001 From: Alastair Bridgewater Date: Sat, 7 Aug 2010 13:46:38 +0000 Subject: [PATCH] 1.0.41.22: runtime: Rename backtrace() to lisp_backtrace(). * glibc provides a backtrace() function which can be useful for debugging runtime problems, but we already have a backtrace() function. Rename our backtrace() function so that it cannot collide with the glibc version. --- src/runtime/backtrace.c | 6 +++--- src/runtime/monitor.c | 4 ++-- version.lisp-expr | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c index a9fde5d..1d9b506 100644 --- a/src/runtime/backtrace.c +++ b/src/runtime/backtrace.c @@ -214,7 +214,7 @@ previous_info(struct call_info *info) } void -backtrace(int nframes) +lisp_backtrace(int nframes) { struct call_info info; @@ -523,7 +523,7 @@ describe_thread_state(void) printf("Pending handler = %p\n", data->pending_handler); } -/* This function has been split from backtrace() to enable Lisp +/* This function has been split from lisp_backtrace() to enable Lisp * backtraces from gdb with call backtrace_from_fp(...). Useful for * example when debugging threading deadlocks. */ @@ -571,7 +571,7 @@ backtrace_from_fp(void *fp, int nframes) } void -backtrace(int nframes) +lisp_backtrace(int nframes) { void *fp; diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index 1f13630..45a9b00 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -393,7 +393,7 @@ print_context_cmd(char **ptr) static void backtrace_cmd(char **ptr) { - void backtrace(int frames); + void lisp_backtrace(int frames); int n; if (more_p(ptr)) @@ -402,7 +402,7 @@ backtrace_cmd(char **ptr) n = 100; printf("Backtrace:\n"); - backtrace(n); + lisp_backtrace(n); } static void diff --git a/version.lisp-expr b/version.lisp-expr index 6854cea..5d28a90 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.41.21" +"1.0.41.22" -- 1.7.10.4