From 202abfa0decf9926a4460b7465153ffd08fb96f2 Mon Sep 17 00:00:00 2001 From: Heiko Voigt Date: Tue, 26 Jan 2010 21:17:36 +0100 Subject: [PATCH] mingw: move unlink wrapper to mingw.c The next patch implements a workaround in case unlink fails on Windows. Signed-off-by: Heiko Voigt --- compat/mingw.c | 8 ++++++++ compat/mingw.h | 11 +++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index 39296a5e0c..a1f40d2210 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -155,6 +155,14 @@ int mingw_mkdir(const char *path, int mode) return ret; } +#undef unlink +int mingw_unlink(const char *pathname) +{ + /* read-only files cannot be removed */ + chmod(pathname, 0666); + return unlink(pathname); +} + #undef open int mingw_open (const char *filename, int oflags, ...) { diff --git a/compat/mingw.h b/compat/mingw.h index f8ec49ea9a..f5f9c6cdd1 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -122,14 +122,6 @@ static inline int fcntl(int fd, int cmd, ...) int mingw_mkdir(const char *path, int mode); #define mkdir mingw_mkdir -static inline int mingw_unlink(const char *pathname) -{ - /* read-only files cannot be removed */ - chmod(pathname, 0666); - return unlink(pathname); -} -#define unlink mingw_unlink - #define WNOHANG 1 pid_t waitpid(pid_t pid, int *status, unsigned options); @@ -177,6 +169,9 @@ int link(const char *oldpath, const char *newpath); * replacements of existing functions */ +int mingw_unlink(const char *pathname); +#define unlink mingw_unlink + int mingw_open (const char *filename, int oflags, ...); #define open mingw_open -- 2.11.4.GIT