diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
| commit | e141b55eccf3c69d8ced513992e21463d37dbb03 (patch) | |
| tree | eaeeeda04d5b6ce82d43d04466164b44a74d0951 /xorg-server/os/backtrace.c | |
| parent | d0fe50e45b3a640afa51eb8f45cf7c3a0df0740b (diff) | |
| parent | 1f876171067c04fc21fccd5a3051f982fd85c0f0 (diff) | |
| download | vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.gz vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.bz2 vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/os/backtrace.c')
| -rw-r--r-- | xorg-server/os/backtrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
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]); } } |