diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-22 16:08:24 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-22 16:08:24 +0000 |
| commit | f65bf4bd28cd9240c889bfd2a1f4650d91760a2d (patch) | |
| tree | 6730a4d5ca802cc2c4cdb128dca07f1e95cac0fb /src/common/malloc.h | |
| parent | 6b0b62a5b2a9d85f60afe4fe048403101bd8f39d (diff) | |
| download | hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.tar.gz hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.tar.bz2 hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.tar.xz hercules-f65bf4bd28cd9240c889bfd2a1f4650d91760a2d.zip | |
* Corrected Spiral Pierce's hits in the skill_db
* Moved /common/*.o into a obj folder when compiling
* Updated core and map server to jA 1094~1115
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1162 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/malloc.h')
| -rw-r--r-- | src/common/malloc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h index d90665487..45451c9e0 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -59,15 +59,19 @@ void* aMalloc_( size_t size, const char *file, int line, const char *func ); void* aCalloc_( size_t num, size_t size, const char *file, int line, const char *func ); void* aRealloc_( void *p, size_t size, const char *file, int line, const char *func ); + void aFree_( void *p, const char *file, int line, const char *func ); + void* aStrdup_( const void *p, const char *file, int line, const char *func ); # define aMalloc(n) aMalloc_(n,ALC_MARK) # define aMallocA(n) aMalloc_(n,ALC_MARK) # define aCalloc(m,n) aCalloc_(m,n,ALC_MARK) # define aCallocA(m,n) aCalloc_(m,n,ALC_MARK) # define aRealloc(p,n) aRealloc_(p,n,ALC_MARK) -# define aFree(ptr) free(ptr) -# define aStrdup(ptr) strdup(ptr) +# define aStrdup(p) aStrdup_(p,ALC_MARK) +# define aFree(p) do { aFree_(p,ALC_MARK); if(p != NULL) { p = NULL; } } while(0) #endif +int do_init_memmgr(const char* file); + #endif |