diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:10:39 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:10:39 +0000 |
commit | f479859a6761191d458e3134dc20d2136356313b (patch) | |
tree | 224eba1bcbae99bc9ad12e2af64dc1bb6983a7ed /sal | |
parent | 0a117099da7a6d3ea71d79e2b89d9ec5d25db020 (diff) |
INTEGRATION: CWS os2port03 (1.5.28); FILE MERGED
2008/07/16 12:26:16 obr 1.5.28.3: RESYNC: (1.5-1.6); FILE MERGED
2008/04/18 04:34:57 obr 1.5.28.2: partially revert changes to fix build breakers on Solaris/Windows
2008/04/15 14:31:30 ydario 1.5.28.1: Issue number: i85203
Submitted by: ydario
Reviewed by: ydario
Diffstat (limited to 'sal')
-rw-r--r-- | sal/rtl/source/alloc_cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c index 3982a72d446f..d595e536c917 100644 --- a/sal/rtl/source/alloc_cache.c +++ b/sal/rtl/source/alloc_cache.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: alloc_cache.c,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -1114,7 +1114,7 @@ SAL_CALL rtl_cache_create ( void * userarg, rtl_arena_type * source, int flags -) +) SAL_THROW_EXTERN_C() { rtl_cache_type * result = 0; sal_Size size = sizeof(rtl_cache_type); @@ -1169,7 +1169,7 @@ try_alloc: */ void SAL_CALL rtl_cache_destroy ( rtl_cache_type * cache -) +) SAL_THROW_EXTERN_C() { if (cache != 0) { @@ -1184,7 +1184,7 @@ void SAL_CALL rtl_cache_destroy ( void * SAL_CALL rtl_cache_alloc ( rtl_cache_type * cache -) +) SAL_THROW_EXTERN_C() { void * obj = 0; @@ -1257,7 +1257,7 @@ void SAL_CALL rtl_cache_free ( rtl_cache_type * cache, void * obj -) +) SAL_THROW_EXTERN_C() { if ((obj != 0) && (cache != 0)) { |