diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:11:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:11:06 +0000 |
| commit | 26ce9ac1f3f7f3c354a664a9754230ec7dd85c28 (patch) | |
| tree | ea47d0ce576e3e3f8987016ee12dfb3300403c73 /sal | |
| parent | f479859a6761191d458e3134dc20d2136356313b (diff) | |
INTEGRATION: CWS os2port03 (1.3.250); FILE MERGED
2008/07/16 12:26:20 obr 1.3.250.3: RESYNC: (1.3-1.5); FILE MERGED
2008/04/18 04:34:57 obr 1.3.250.2: partially revert changes to fix build breakers on Solaris/Windows
2008/04/15 14:31:30 ydario 1.3.250.1: Issue number: i85203
Submitted by: ydario
Reviewed by: ydario
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/alloc_global.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c index f85856d1a57a..b1121d13b93b 100644 --- a/sal/rtl/source/alloc_global.c +++ b/sal/rtl/source/alloc_global.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: alloc_global.c,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -189,7 +189,7 @@ rtl_memory_fini (void) * ================================================================= */ void * -SAL_CALL rtl_allocateMemory (sal_Size n) +SAL_CALL rtl_allocateMemory (sal_Size n) SAL_THROW_EXTERN_C() { void * p = 0; if (n > 0) @@ -231,7 +231,7 @@ try_alloc: /* ================================================================= */ -void SAL_CALL rtl_freeMemory (void * p) +void SAL_CALL rtl_freeMemory (void * p) SAL_THROW_EXTERN_C() { if (p != 0) { @@ -248,7 +248,7 @@ void SAL_CALL rtl_freeMemory (void * p) /* ================================================================= */ -void * SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) +void * SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C() { if (n > 0) { @@ -330,7 +330,7 @@ rtl_memory_fini (void) * * ================================================================= */ -void * SAL_CALL rtl_allocateZeroMemory (sal_Size n) +void * SAL_CALL rtl_allocateZeroMemory (sal_Size n) SAL_THROW_EXTERN_C() { void * p = rtl_allocateMemory (n); if (p != 0) @@ -340,7 +340,7 @@ void * SAL_CALL rtl_allocateZeroMemory (sal_Size n) /* ================================================================= */ -void SAL_CALL rtl_freeZeroMemory (void * p, sal_Size n) +void SAL_CALL rtl_freeZeroMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C() { if (p != 0) { |