diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 11:19:52 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 11:19:52 +0000 |
| commit | f5688378e14d3ef3e4c5cc0f37dd3281e2edeb86 (patch) | |
| tree | ace4783bdf7c631660280fd480cb89a195b9ae84 /sal/osl/unx/signal.c | |
| parent | 061973139272b26f62ce1b68d4e8eaf13e4ce8ad (diff) | |
INTEGRATION: CWS sb81 (1.34.46); FILE MERGED
2007/11/02 17:00:25 sb 1.34.46.1: #i83203# SAL_PRI... stuff for portable printf-style conversion specifications.
Diffstat (limited to 'sal/osl/unx/signal.c')
| -rw-r--r-- | sal/osl/unx/signal.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index e446f512f958..133809b39b18 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -4,9 +4,9 @@ * * $RCSfile: signal.c,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: hr $ $Date: 2007-08-02 14:22:51 $ + * last change: $Author: ihi $ $Date: 2007-11-22 12:19:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -507,12 +507,12 @@ static int ReportCrash( int Signal ) { Dl_info dl_info; - fprintf( stackout, "0x%x:", - (unsigned int)stackframes[iFrame] ); + fprintf( stackout, "0x%" SAL_PRIxUINTPTR ":", + SAL_INT_CAST(sal_uIntPtr, stackframes[iFrame]) ); - fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%x\"", + fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%" SAL_PRIxUINTPTR "\"", iFrame, - (unsigned int)stackframes[iFrame] + SAL_INT_CAST(sal_uIntPtr, stackframes[iFrame]) ); memset( &dl_info, 0, sizeof(dl_info) ); @@ -565,12 +565,12 @@ static int ReportCrash( int Signal ) if ( dl_info.dli_fbase && dl_info.dli_fname ) { - fprintf( stackout, " %s + 0x%x", + fprintf( stackout, " %s + 0x%" SAL_PRI_PTRDIFFT "x", dl_info.dli_fname, (char*)stackframes[iFrame] - (char*)dl_info.dli_fbase ); - fprintf( xmlout, " rel=\"0x%x\"", (char *)stackframes[iFrame] - (char *)dl_info.dli_fbase ); + fprintf( xmlout, " rel=\"0x%" SAL_PRI_PTRDIFFT "x\"", (char *)stackframes[iFrame] - (char *)dl_info.dli_fbase ); if ( dli_fname ) fprintf( xmlout, " name=\"%s\"", dli_fname ); @@ -584,12 +584,12 @@ static int ReportCrash( int Signal ) { fputs( " (", stackout ); fputs_xml( dl_info.dli_sname, stackout ); - fprintf( stackout, " + 0x%x)", + fprintf( stackout, " + 0x%" SAL_PRI_PTRDIFFT "x)", (char*)stackframes[iFrame] - (char*)dl_info.dli_saddr ); fputs( " ordinal=\"", xmlout ); fputs_xml( dl_info.dli_sname, xmlout ); - fprintf( xmlout, "+0x%x\"", + fprintf( xmlout, "+0x%" SAL_PRI_PTRDIFFT "x\"", (char *)stackframes[iFrame] - (char *)dl_info.dli_saddr ); } |