diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-06-17 12:25:20 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-06-17 12:25:20 +0000 |
commit | b205d6165a963a8d3327aaa7341e2e3d96343d8b (patch) | |
tree | 26b8bce618c2f7fb3ac761d6f83cb1d30fa04053 /sal | |
parent | 2b027d69cd9dc3b3a341397838c3856d49e2de80 (diff) |
INTEGRATION: CWS ooo64bit01 (1.5.248); FILE MERGED
2004/03/16 23:54:10 fa 1.5.248.1: Merge cws_srx644_port64bit, other misc fixes
Diffstat (limited to 'sal')
-rw-r--r-- | sal/inc/rtl/alloc.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sal/inc/rtl/alloc.h b/sal/inc/rtl/alloc.h index 37e07c4635a0..a5df0b73a772 100644 --- a/sal/inc/rtl/alloc.h +++ b/sal/inc/rtl/alloc.h @@ -2,9 +2,9 @@ * * $RCSfile: alloc.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mhu $ $Date: 2001-11-29 19:02:40 $ + * last change: $Author: rt $ $Date: 2004-06-17 13:25:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ extern "C" { @return pointer to allocated memory. */ void * SAL_CALL rtl_allocateMemory ( - sal_uInt32 Bytes + sal_Size Bytes ) SAL_THROW_EXTERN_C(); @@ -98,8 +98,8 @@ void * SAL_CALL rtl_allocateMemory ( @return pointer to reallocated memory. May differ from Ptr. */ void * SAL_CALL rtl_reallocateMemory ( - void * Ptr, - sal_uInt32 Bytes + void * Ptr, + sal_Size Bytes ) SAL_THROW_EXTERN_C(); @@ -120,7 +120,7 @@ void SAL_CALL rtl_freeMemory ( @return pointer to allocated and zero'ed memory. */ void * SAL_CALL rtl_allocateZeroMemory ( - sal_uInt32 Bytes + sal_Size Bytes ) SAL_THROW_EXTERN_C(); @@ -130,8 +130,8 @@ void * SAL_CALL rtl_allocateZeroMemory ( @return none. Memory is zero'ed and released. Ptr is invalid. */ void SAL_CALL rtl_freeZeroMemory ( - void * Ptr, - sal_uInt32 Bytes + void * Ptr, + sal_Size Bytes ) SAL_THROW_EXTERN_C(); |