diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
| commit | 44826499c23720be3d74ab674c4fd38912c5b8c2 (patch) | |
| tree | 613bec9c2242e5e0700bef1ba87ca2d25d755795 /src/logging | |
| parent | 9a8ff86a032d1e4dd04238fcde856b145406df6f (diff) | |
| parent | 8c98b34228abb4dfde822ad89106b4d8b2287639 (diff) | |
Merge tag 'upstream/0.9.6.0' into experimental
Upstream version 0.9.6.0
Diffstat (limited to 'src/logging')
| -rw-r--r-- | src/logging/nm-logging.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index f54adcdd..8ec22982 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -261,13 +261,13 @@ fallback_get_backtrace (void) syslog (LOG_CRIT, "Frame %d: %s (%s+0x%lx) [%p]", i, name, info.dli_sname, - (gulong)(frames[i] - info.dli_saddr), + (gulong)((guchar *)frames[i] - (guchar *)info.dli_saddr), frames[i]); } else { syslog (LOG_CRIT, "Frame %d: %s (%p+0x%lx) [%p]", i, name, info.dli_fbase, - (gulong)(frames[i] - info.dli_saddr), + (gulong)((guchar *)frames[i] - (guchar *)info.dli_saddr), frames[i]); } } |