diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 11:19:35 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-22 11:19:35 +0000 |
| commit | 061973139272b26f62ce1b68d4e8eaf13e4ce8ad (patch) | |
| tree | b9628a7726177d03032239d8769a4f8db9295210 /sal | |
| parent | INTEGRATION: CWS sb81 (1.31.34); FILE MERGED (diff) | |
| download | core-061973139272b26f62ce1b68d4e8eaf13e4ce8ad.tar.gz core-061973139272b26f62ce1b68d4e8eaf13e4ce8ad.zip | |
INTEGRATION: CWS sb81 (1.22.118); FILE MERGED
2007/11/02 17:00:25 sb 1.22.118.1: #i83203# SAL_PRI... stuff for portable printf-style conversion specifications.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/diagnose.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c index 6cca6bfe4934..ed299810429c 100644 --- a/sal/osl/unx/diagnose.c +++ b/sal/osl/unx/diagnose.c @@ -4,9 +4,9 @@ * * $RCSfile: diagnose.c,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: vg $ $Date: 2007-01-18 14:17:30 $ + * last change: $Author: ihi $ $Date: 2007-11-22 12:19:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,7 +120,7 @@ static void osl_diagnose_frame_Impl ( offset = (ptrdiff_t)(pc); snprintf (szMessage, sizeof(szMessage), - "Backtrace: [%d] %s: %s+0x%x\n", + "Backtrace: [%d] %s: %s+0x%" SAL_PRI_PTRDIFFT "x\n", depth, fname ? fname : "<unknown>", sname ? sname : "???", @@ -238,13 +238,13 @@ sal_Bool SAL_CALL osl_assertFailedLine ( if (pszMessage != 0) { snprintf(szMessage, sizeof(szMessage), - "Error: File %s, Line %lu: %s\n", + "Error: File %s, Line %" SAL_PRIdINT32 ": %s\n", pszFileName, nLine, pszMessage); } else { snprintf(szMessage, sizeof(szMessage), - "Error: File %s, Line %lu\n", + "Error: File %s, Line %" SAL_PRIdINT32 "\n", pszFileName, nLine); } |