Changeset 63

Show
Ignore:
Timestamp:
04/26/05 16:29:20 (4 years ago)
Author:
zoeloelip
Message:

Patch [1173095]: mm_alloc & mm_free clash with libirc

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • eaccelerator/trunk/mm.c

    r4 r63  
    11021102#endif 
    11031103 
    1104 void* mm_malloc(MM* mm, size_t size) { 
     1104void* mm_malloc_lock(MM* mm, size_t size) { 
    11051105  void *ret; 
    11061106  mm_lock(mm, MM_LOCK_RW); 
     
    11101110} 
    11111111 
    1112 void mm_free(MM* mm, void* x) { 
     1112void mm_free_lock(MM* mm, void* x) { 
    11131113  mm_lock(mm, MM_LOCK_RW); 
    11141114  mm_free_nolock(mm,x); 
  • eaccelerator/trunk/mm.h

    r4 r63  
    3030size_t _mm_available(MM* mm); 
    3131size_t _mm_maxsize(MM* mm); 
    32 void*  _mm_malloc(MM* mm, size_t size); 
    33 void   _mm_free(MM* mm, void* p); 
     32void*  _mm_malloc_lock(MM* mm, size_t size); 
     33void   _mm_free_lock(MM* mm, void* p); 
    3434void*  _mm_malloc_nolock(MM* mm, size_t size); 
    3535void   _mm_free_nolock(MM* mm, void* p); 
     
    5858#define mm_available(A)        _mm_available(A) 
    5959#define mm_maxsize(A)          _mm_maxsize(A) 
    60 #define mm_malloc(A, B)        _mm_malloc(A, B) 
    61 #define mm_free(A, B)          _mm_free(A, B) 
     60#define mm_malloc_lock(A, B)   _mm_malloc_lock(A, B) 
     61#define mm_free_lock(A, B)     _mm_free_lock(A, B) 
    6262#define mm_malloc_nolock(A, B) _mm_malloc_nolock(A, B) 
    6363#define mm_free_nolock(A, B)   _mm_free_nolock(A, B)