diff options
| author | Earisu <bruant.bastien@gmail.com> | 2013-05-17 14:04:47 -0700 |
|---|---|---|
| committer | Earisu <bruant.bastien@gmail.com> | 2013-05-17 14:04:47 -0700 |
| commit | 9afe7f28d0e3f4c9bc3abba22d8055ae7dc46f45 (patch) | |
| tree | 781518d71c67b8fbfbecce28cc377bff66acc2bd | |
| parent | 25e848f1a0f9317d63106cae048a1ef838411cb2 (diff) | |
| parent | b0f866ca419d87fcb3625b45e2437e0a0bb1810e (diff) | |
| download | hercules-9afe7f28d0e3f4c9bc3abba22d8055ae7dc46f45.tar.gz hercules-9afe7f28d0e3f4c9bc3abba22d8055ae7dc46f45.tar.bz2 hercules-9afe7f28d0e3f4c9bc3abba22d8055ae7dc46f45.tar.xz hercules-9afe7f28d0e3f4c9bc3abba22d8055ae7dc46f45.zip | |
Merge pull request #1 from shennetsind/master
HPM Update Addition
| -rw-r--r-- | src/common/malloc.c | 4 | ||||
| -rw-r--r-- | src/common/malloc.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/malloc.c b/src/common/malloc.c index 77eef2508..4874aa0f4 100644 --- a/src/common/malloc.c +++ b/src/common/malloc.c @@ -734,13 +734,13 @@ void malloc_defaults() malloclib->malloc = _mmalloc; malloclib->calloc = _mcalloc; malloclib->realloc = _mrealloc; - malloclib->strdup = _mstrdup; + malloclib->astrdup = _mstrdup; malloclib->free = _mfree; #else malloclib->malloc = aMalloc_; malloclib->calloc = aCalloc_; malloclib->realloc = aRealloc_; - malloclib->strdup = aStrdup_; + malloclib->astrdup = aStrdup_; malloclib->free = aFree_; #endif } diff --git a/src/common/malloc.h b/src/common/malloc.h index 2e745481f..34a26b56e 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -27,13 +27,13 @@ // no logging for minicore #if defined(MINICORE) && defined(LOG_MEMMGR) -#undef LOG_MEMMGR + #undef LOG_MEMMGR #endif # define aMalloc(n) malloclib->malloc (n,ALC_MARK) # define aCalloc(m,n) malloclib->calloc (m,n,ALC_MARK) # define aRealloc(p,n) malloclib->realloc (p,n,ALC_MARK) -# define aStrdup(p) malloclib->strdup (p,ALC_MARK) +# define aStrdup(p) malloclib->astrdup (p,ALC_MARK) # define aFree(p) malloclib->free (p,ALC_MARK) /////////////// Buffer Creation ///////////////// @@ -70,8 +70,8 @@ struct malloc_interface { void* (*malloc )(size_t size, const char *file, int line, const char *func); void* (*calloc )(size_t num, size_t size, const char *file, int line, const char *func); void* (*realloc )(void *p, size_t size, const char *file, int line, const char *func); - char* (*strdup )(const char *p, const char *file, int line, const char *func); - void (*free ) (void *p, const char *file, int line, const char *func); + char* (*astrdup )(const char *p, const char *file, int line, const char *func); + void (*free )(void *p, const char *file, int line, const char *func); void (*memory_check)(void); bool (*verify_ptr)(void* ptr); |