summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-05-17 15:39:13 -0300
committershennetsind <ind@henn.et>2013-05-17 15:39:13 -0300
commit105101af513e24c2d2ff113f5d9b1aaab1326255 (patch)
treed474510205fc9268b9f0eb1a5af04ee3068f0ca2
parent080f7a22740225df70a488849587b462a5d6b1a3 (diff)
downloadhercules-105101af513e24c2d2ff113f5d9b1aaab1326255.tar.gz
hercules-105101af513e24c2d2ff113f5d9b1aaab1326255.tar.bz2
hercules-105101af513e24c2d2ff113f5d9b1aaab1326255.tar.xz
hercules-105101af513e24c2d2ff113f5d9b1aaab1326255.zip
Travis Fix Attempt #1
Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--src/common/malloc.c4
-rw-r--r--src/common/malloc.h6
2 files changed, 5 insertions, 5 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..c0b1fda84 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,7 +70,7 @@ 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);
+ 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);