[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl

[Damjan Jovanovic]

 sal/osl/unx/backtrace.c |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

New commits:
commit e0e462a3e64576be14a4341f4dc4a2d56f22fa2a
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Fri Nov 27 04:01:03 2015 +0000

    Use the ptrdiff_t printf format code for backtracing on FreeBSD.
    
    Patch by: me

diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 1b0b8a8..4ba05cc 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -19,7 +19,7 @@
  *
  *************************************************************/
 
-
+#include "sal/types.h"
 
 
 #ifdef SOLARIS
@@ -184,20 +184,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;
-#if defined X86_64
-                    fprintf( fp, "%s+0x%lx", dli.dli_fname, offset );
-#else
-                    fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
-#endif
+                    fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname, offset );
                 }
                 if ( dli.dli_sname && dli.dli_saddr )
                 {
                     offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-#if defined X86_64
-                    fprintf( fp, "(%s+0x%lx)", dli.dli_sname, offset );
-#else
-                    fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
-#endif
+                    fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", dli.dli_sname, offset );
                 }
             }
             fprintf( fp, "[0x%p]\n", *pFramePtr );