aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-15 08:09:08 +0000
committermarha <marha@users.sourceforge.net>2009-12-15 08:09:08 +0000
commitc915fe74ff1b1d02f7506a187bc9b588f5c21f97 (patch)
tree7ecc8f8867bac10fcfc1299469333178f7cf5838 /xorg-server/os
parent0925cb4f76a1667fb3777efbe6a0e0e69c4cca3c (diff)
parent9b17452909d3140fa33a753cadfaa6e9006b9685 (diff)
downloadvcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.gz
vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.bz2
vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.zip
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/os')
-rw-r--r--xorg-server/os/backtrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/os/backtrace.c b/xorg-server/os/backtrace.c
index dafb9904b..7ca6dab6d 100644
--- a/xorg-server/os/backtrace.c
+++ b/xorg-server/os/backtrace.c
@@ -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, (char *) array[i] - (char *) info.dli_saddr, array[i]);
+ info.dli_sname, (long unsigned int)((char *) array[i] - (char *) info.dli_saddr), array[i]);
else
ErrorF("%d: %s (%p+0x%lx) [%p]\n", i, mod,
- info.dli_fbase, (char *) array[i] - (char *) info.dli_fbase, array[i]);
+ info.dli_fbase, (long unsigned int)((char *) array[i] - (char *) info.dli_fbase), array[i]);
}
}