sal/osl/unx/backtrace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit 5adaf30d7403dab3f81f2efc457bfb78e0e49f7b Author: Stephan Bergmann <[email protected]> Date: Mon Nov 30 20:05:58 2015 +0100 Fix Mac build Change-Id: I3ec80e4a64c98b97ab3157dd37614a7c56802d79 diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c index 340b507..a8177e6 100644 --- a/sal/osl/unx/backtrace.c +++ b/sal/osl/unx/backtrace.c @@ -209,8 +209,6 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) #include <stdio.h> #include "backtrace.h" -typedef unsigned ptrdiff_t; - /* glib backtrace is only available on MacOsX 10.5 or higher so we do it on our own */ @@ -251,12 +249,12 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) if ( dli.dli_fname && dli.dli_fbase ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; - fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); + fprintf( fp, "%s+0x%tx", dli.dli_fname, offset ); } if ( dli.dli_sname && dli.dli_saddr ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; - fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); + fprintf( fp, "(%s+0x%tx)", dli.dli_sname, offset ); } } fprintf( fp, "[0x%x]\n", (unsigned int)*pFramePtr ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
