diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:09:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:09:39 +0000 |
| commit | 4d2142ebe0d1149158ec92e16db2be9d46fc4920 (patch) | |
| tree | d34f34df6106fecd4efa8e7a2ee361c761ea0728 | |
| parent | 6308ab4208772cb9dc9efa133b4ee6d21e07e20b (diff) | |
INTEGRATION: CWS os2port03 (1.5.58); FILE MERGED
2008/07/16 12:26:11 obr 1.5.58.2: RESYNC: (1.5-1.6); FILE MERGED
2008/04/15 14:31:30 ydario 1.5.58.1: Issue number: i85203
Submitted by: ydario
Reviewed by: ydario
| -rw-r--r-- | sal/rtl/source/alloc_arena.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c index e7efc8a30..9a7c7715e 100644 --- a/sal/rtl/source/alloc_arena.c +++ b/sal/rtl/source/alloc_arena.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: alloc_arena.c,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -329,7 +329,7 @@ rtl_arena_hash_rescale ( sal_Size new_bytes; new_bytes = new_size * sizeof(rtl_arena_segment_type*); - new_table = rtl_arena_alloc (gp_arena_arena, &new_bytes); + new_table = (rtl_arena_segment_type **)rtl_arena_alloc (gp_arena_arena, &new_bytes); if (new_table != 0) { @@ -788,7 +788,7 @@ rtl_arena_activate ( int i, n = (arena->m_qcache_max >> arena->m_quantum_shift); sal_Size size = n * sizeof(rtl_cache_type*); - arena->m_qcache_ptr = rtl_arena_alloc (gp_arena_arena, &size); + arena->m_qcache_ptr = (rtl_cache_type**)rtl_arena_alloc (gp_arena_arena, &size); if (!(arena->m_qcache_ptr)) { /* out of memory */ @@ -956,7 +956,7 @@ SAL_CALL rtl_arena_create ( void * (SAL_CALL * source_alloc)(rtl_arena_type *, sal_Size *), void (SAL_CALL * source_free) (rtl_arena_type *, void *, sal_Size), int flags -) +) SAL_THROW_EXTERN_C() { rtl_arena_type * result = 0; sal_Size size = sizeof(rtl_arena_type); @@ -964,7 +964,7 @@ SAL_CALL rtl_arena_create ( (void) flags; /* unused */ try_alloc: - result = rtl_arena_alloc (gp_arena_arena, &size); + result = (rtl_arena_type*)rtl_arena_alloc (gp_arena_arena, &size); if (result != 0) { rtl_arena_type * arena = result; @@ -1009,7 +1009,7 @@ try_alloc: void SAL_CALL rtl_arena_destroy ( rtl_arena_type * arena -) +) { if (arena != 0) { @@ -1025,7 +1025,7 @@ void * SAL_CALL rtl_arena_alloc ( rtl_arena_type * arena, sal_Size * pSize -) +) SAL_THROW_EXTERN_C() { void * addr = 0; @@ -1096,7 +1096,7 @@ SAL_CALL rtl_arena_free ( rtl_arena_type * arena, void * addr, sal_Size size -) +) SAL_THROW_EXTERN_C() { if (arena != 0) { |