1
0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00

- The memory allocated by malloc() and friends is now of type MEMF_PRIVATE

under OS4 and beyond. The AmigaOS 2.x/3.x compatible code will still
  use MEMF_ANY in the same situation, though. Other uses of MEMF_ANY have
  been replaced as well where MEMF_PRIVATE would have made better sense.


git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15201 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2008-09-30 14:09:00 +00:00
parent 8a1347e61d
commit 4291a0564f
5 changed files with 52 additions and 9 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: stdlib_malloc.c,v 1.19 2006-01-08 12:04:25 obarthel Exp $
* $Id: stdlib_malloc.c,v 1.20 2008-09-30 14:09:00 obarthel Exp $
*
* :ts=4
*
@ -143,9 +143,21 @@ __allocate_memory(size_t size,BOOL never_free,const char * UNUSED unused_file,in
#endif /* __MEM_DEBUG */
if(__memory_pool != NULL)
{
mn = AllocPooled(__memory_pool,allocation_size);
}
else
mn = AllocMem(allocation_size,MEMF_ANY);
{
#if defined(__amigaos4__)
{
mn = AllocMem(allocation_size,MEMF_PRIVATE);
}
#else
{
mn = AllocMem(allocation_size,MEMF_ANY);
}
#endif /* __amigaos4__ */
}
if(mn == NULL)
{
@ -401,7 +413,7 @@ STDLIB_CONSTRUCTOR(stdlib_memory_init)
#if defined(__amigaos4__)
{
__memory_pool = CreatePool(MEMF_ANY,(ULONG)__default_pool_size,(ULONG)__default_puddle_size);
__memory_pool = CreatePool(MEMF_PRIVATE,(ULONG)__default_pool_size,(ULONG)__default_puddle_size);
}
#else
{