diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-06-17 12:26:27 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-06-17 12:26:27 +0000 |
commit | 1308223c85efe84b54d4be1a8b14b92556801ce4 (patch) | |
tree | aa1bb46f582610b752a1be4f3eb99264138f0efc /sal | |
parent | daee63c6af3ada7789b0e612db17eeaf040af514 (diff) |
INTEGRATION: CWS ooo64bit01 (1.9.42); FILE MERGED
2004/05/02 16:29:42 svesik 1.9.42.2: RESYNC: (1.9-1.11); FILE MERGED
2004/03/16 23:54:11 fa 1.9.42.1: Merge cws_srx644_port64bit, other misc fixes
Diffstat (limited to 'sal')
-rw-r--r-- | sal/inc/rtl/ustring.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h index 63f3cfdb456d..547c82493a43 100644 --- a/sal/inc/rtl/ustring.h +++ b/sal/inc/rtl/ustring.h @@ -2,9 +2,9 @@ * * $RCSfile: ustring.h,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2004-04-14 11:48:34 $ + * last change: $Author: rt $ $Date: 2004-06-17 13:26:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1377,7 +1377,7 @@ sal_Int32 SAL_CALL rtl_uString_getToken( rtl_uString ** newStr , rtl_uString * s /* ======================================================================= */ /* constAsciiStr must be a "..." or char const aFoo[] = "..." */ -#define RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) constAsciiStr, sizeof( constAsciiStr )-1, RTL_TEXTENCODING_ASCII_US +#define RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) constAsciiStr, ((sal_Int32)(sizeof(constAsciiStr)-1)), RTL_TEXTENCODING_ASCII_US /* ======================================================================= */ |