From 53d1ec0447b3868d5d338576156988961916a4db Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Wed, 14 Jul 2010 16:35:41 +0800 Subject: [PATCH] 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 #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, -- 2.7.4