aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-06-08 16:51:45 +0800
committerFeng Tang <feng.tang@intel.com>2010-07-20 11:10:03 +0800
commit9333426bffb6bb3f1b6193369097fb4bcaee64ad (patch)
tree66e9dd510970e22676136a26b65162686e79880d
parent847c7eeabe11032a13e04a8b29526b3024906d98 (diff)
downloadsyslinux-9333426bffb6bb3f1b6193369097fb4bcaee64ad.tar.gz
syslinux-9333426bffb6bb3f1b6193369097fb4bcaee64ad.tar.xz
syslinux-9333426bffb6bb3f1b6193369097fb4bcaee64ad.zip
elflink: fix the global naming for lmalloc
core and com32 both have their lmalloc definition, change com32's from lmalloc to clmalloc
-rw-r--r--com32/include/com32.h2
-rwxr-xr-xcom32/lib/Makefile4
-rw-r--r--com32/lib/lmalloc.c2
-rw-r--r--com32/lib/lstrdup.c2
4 files changed, 7 insertions, 3 deletions
diff --git a/com32/include/com32.h b/com32/include/com32.h
index 6b142082..f49f9eab 100644
--- a/com32/include/com32.h
+++ b/com32/include/com32.h
@@ -120,7 +120,7 @@ extern const com32sys_t __com32_zero_regs;
/*
* Lowmem allocation functions
*/
-void *lmalloc(size_t);
+void *clmalloc(size_t);
void *lzalloc(size_t);
void lfree(void *);
char *lstrdup(const char *);
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index c7e7e7dc..41ae34c3 100755
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -125,6 +125,10 @@ LIBOTHER_OBJS = \
asprintf.o vasprintf.o strlcpy.o strlcat.o \
vsscanf.o zalloc.o \
\
+ lmalloc.o lstrdup.o \
+ \
+ dprintf.o vdprintf.o \
+ \
sys/readdir.o getcwd.o chdir.o fdopendir.o \
\
libgcc/__ashldi3.o libgcc/__udivdi3.o \
diff --git a/com32/lib/lmalloc.c b/com32/lib/lmalloc.c
index a646556c..69438bdc 100644
--- a/com32/lib/lmalloc.c
+++ b/com32/lib/lmalloc.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <syslinux/pmapi.h>
-void *lmalloc(size_t size)
+void *clmalloc(size_t size)
{
void *p;
p = __com32.cs_pm->lmalloc(size);
diff --git a/com32/lib/lstrdup.c b/com32/lib/lstrdup.c
index d11efe7e..6747ef3a 100644
--- a/com32/lib/lstrdup.c
+++ b/com32/lib/lstrdup.c
@@ -9,7 +9,7 @@
char *lstrdup(const char *s)
{
int l = strlen(s) + 1;
- char *d = lmalloc(l);
+ char *d = clmalloc(l);
if (d)
memcpy(d, s, l);