2
0
mirror of https://github.com/xcat2/xNBA.git synced 2024-12-15 07:41:45 +00:00

Revert "malloc attribute changes"

wasn't meant for my local "master" branch ;)
This reverts commit 373022108b.
This commit is contained in:
Holger Lubitz 2007-08-06 03:36:35 +02:00
parent 4f66879653
commit 7815474495
3 changed files with 2 additions and 10 deletions

View File

@ -135,7 +135,6 @@ static void ecollect_free ( void ) {
* Calling realloc() with a new size of zero is a valid way to free a
* memory block.
*/
__attribute__ ((malloc))
userptr_t urealloc ( userptr_t ptr, size_t new_size ) {
struct external_memory extmem;
userptr_t new = ptr;
@ -209,7 +208,6 @@ userptr_t urealloc ( userptr_t ptr, size_t new_size ) {
*
* Memory is guaranteed to be aligned to a page boundary.
*/
__attribute__ ((malloc))
userptr_t umalloc ( size_t size ) {
return urealloc ( UNULL, size );
}

View File

@ -95,7 +95,6 @@ static char heap[HEAP_SIZE] __attribute__ (( aligned ( __alignof__(void *) )));
*
* @c align must be a power of two. @c size may not be zero.
*/
__attribute__ ((malloc))
void * alloc_memblock ( size_t size, size_t align ) {
struct memory_block *block;
size_t align_mask;
@ -249,7 +248,6 @@ void free_memblock ( void *ptr, size_t size ) {
* Calling realloc() with a new size of zero is a valid way to free a
* memory block.
*/
__attribute__ ((malloc))
void * realloc ( void *old_ptr, size_t new_size ) {
struct autosized_block *old_block;
struct autosized_block *new_block;
@ -299,7 +297,6 @@ void * realloc ( void *old_ptr, size_t new_size ) {
* Allocates memory with no particular alignment requirement. @c ptr
* will be aligned to at least a multiple of sizeof(void*).
*/
__attribute__ ((malloc))
void * malloc ( size_t size ) {
return realloc ( NULL, size );
}
@ -329,7 +326,6 @@ void free ( void *ptr ) {
* This function name is non-standard, but pretty intuitive.
* zalloc(size) is always equivalent to calloc(1,size)
*/
__attribute__ ((malloc))
void * zalloc ( size_t size ) {
void *data;

View File

@ -31,14 +31,12 @@ typedef void psPool_t;
#define sslAssert( ... ) assert ( __VA_ARGS__ )
static inline __attribute__ (( always_inline )) __attribute__ ((malloc))
void *
static inline __attribute__ (( always_inline )) void *
psMalloc ( psPool_t *pool __unused, size_t len ) {
return malloc ( len );
}
static inline __attribute__ (( always_inline )) __attribute__ ((malloc))
void *
static inline __attribute__ (( always_inline )) void *
psRealloc ( void *ptr, size_t len ) {
return realloc ( ptr, len );
}