aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-07-14 16:35:41 +0800
committerFeng Tang <feng.tang@intel.com>2010-07-20 11:10:05 +0800
commit53d1ec0447b3868d5d338576156988961916a4db (patch)
treec8d3191020aa2a37c5a853396841fe25e0dd704c
parent2e91ec5f155f04aee878ed70a04fb5b15e40da3b (diff)
downloadsyslinux-53d1ec0447b3868d5d338576156988961916a4db.tar.gz
syslinux-53d1ec0447b3868d5d338576156988961916a4db.tar.xz
syslinux-53d1ec0447b3868d5d338576156988961916a4db.zip
elflink: core: rename getcwd() to avoid conflict
-rw-r--r--core/fs/getcwd.c2
-rw-r--r--core/include/fs.h2
-rw-r--r--core/pmapi.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/fs/getcwd.c b/core/fs/getcwd.c
index a7b6c7a9..ee62411f 100644
--- a/core/fs/getcwd.c
+++ b/core/fs/getcwd.c
@@ -1,7 +1,7 @@
#include <string.h>
#include "fs.h"
-char *getcwd(char *buf, size_t size)
+char *core_getcwd(char *buf, size_t size)
{
char *ret = NULL;
diff --git a/core/include/fs.h b/core/include/fs.h
index da247a98..129ac1e6 100644
--- a/core/include/fs.h
+++ b/core/include/fs.h
@@ -203,7 +203,7 @@ struct dirent *readdir(DIR *dir);
int closedir(DIR *dir);
/* getcwd.c */
-char *getcwd(char *buf, size_t size);
+char *core_getcwd(char *buf, size_t size);
/*
* Generic functions that filesystem drivers may choose to use
diff --git a/core/pmapi.c b/core/pmapi.c
index 4b1ccbb1..932c632b 100644
--- a/core/pmapi.c
+++ b/core/pmapi.c
@@ -36,7 +36,7 @@ const struct com32_pmapi pm_api_vector =
.reset_idle = reset_idle,
.chdir = chdir,
- .getcwd = getcwd,
+ .getcwd = core_getcwd,
.jiffies = &__jiffies,
.ms_timer = &__ms_timer,