[syslinux:elflink] elflink: core: rename getcwd() to avoid conflict
syslinux-bot for Feng Tang
feng.tang at intel.com
Thu Aug 12 21:04:05 PDT 2010
Commit-ID: 53d1ec0447b3868d5d338576156988961916a4db
Gitweb: http://syslinux.zytor.com/commit/53d1ec0447b3868d5d338576156988961916a4db
Author: Feng Tang <feng.tang at intel.com>
AuthorDate: Wed, 14 Jul 2010 16:35:41 +0800
Committer: Feng Tang <feng.tang at intel.com>
CommitDate: Tue, 20 Jul 2010 11:10:05 +0800
elflink: core: rename getcwd() to avoid conflict
---
core/fs/getcwd.c | 2 +-
core/include/fs.h | 2 +-
core/pmapi.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/fs/getcwd.c b/core/fs/getcwd.c
index a7b6c7a..ee62411 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 da247a9..129ac1e 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 4b1ccbb..932c632 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,
More information about the Syslinux-commits
mailing list