summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorDamjan Jovanovic <damjan@apache.org>2015-11-27 04:01:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-11-30 17:24:16 +0000
commit7a93f5348007ab1ce52e65cd3811032f31839689 (patch)
tree7ca549c60cee528eb1c3f1ee2f20965507b3db8c /sal
parent0bd3aa40f5095e13d10f73076d8528178d146664 (diff)
Use the ptrdiff_t printf format code for backtracing on FreeBSD.
Patch by: me (cherry picked from commit e0e462a3e64576be14a4341f4dc4a2d56f22fa2a) Change-Id: I1c59b2b631dbfd508d85abb774f27187ded47c17
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/backtrace.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 522cb6f9463c..43a13d86d0d6 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/types.h"
+
#ifdef SOLARIS
#include <dlfcn.h>
@@ -177,20 +179,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 );