From 1f876171067c04fc21fccd5a3051f982fd85c0f0 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 21 Oct 2009 19:07:36 +0000 Subject: Updated to xorg-server-1.7.99.1 --- xorg-server/os/backtrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/os/backtrace.c') diff --git a/xorg-server/os/backtrace.c b/xorg-server/os/backtrace.c index a421140fb..dafb9904b 100644 --- a/xorg-server/os/backtrace.c +++ b/xorg-server/os/backtrace.c @@ -38,7 +38,7 @@ void xorg_backtrace(void) { void *array[64]; - char *mod; + const char *mod; int size, i; Dl_info info; ErrorF("\nBacktrace:\n"); @@ -48,10 +48,10 @@ void xorg_backtrace(void) mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)"; if (info.dli_saddr) ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod, - info.dli_sname, array[i] - info.dli_saddr, array[i]); + info.dli_sname, (char *) array[i] - (char *) info.dli_saddr, array[i]); else ErrorF("%d: %s (%p+0x%lx) [%p]\n", i, mod, - info.dli_fbase, array[i] - info.dli_fbase, array[i]); + info.dli_fbase, (char *) array[i] - (char *) info.dli_fbase, array[i]); } } -- cgit v1.2.3