# HG changeset patch # User Christian Brabandt # Date 1452978904 -3600 # Node ID 6fed43c541c8b60aca7eec74e6c5bdebaaa3be15 # Parent 931fd6165c4d8347fcb536b8204dc218b70ca8db commit https://github.com/vim/vim/commit/4cf7679383dca81a4a351e2b0ec333c95d6d9085 Author: Bram Moolenaar Date: Sat Jan 16 22:02:57 2016 +0100 patch 7.4.1109 Problem: MS-Windows doesn't have rmdir(). Solution: Add mch_rmdir(). diff --git a/src/os_win32.c b/src/os_win32.c --- a/src/os_win32.c +++ b/src/os_win32.c @@ -3154,6 +3154,30 @@ mch_mkdir(char_u *name) } /* + * Delete directory "name". + * Return 0 on success, -1 on error. + */ + int +mch_rmdir(char_u *name) +{ +#ifdef FEAT_MBYTE + if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) + { + WCHAR *p; + int retval; + + p = enc_to_utf16(name, NULL); + if (p == NULL) + return -1; + retval = _wrmdir(p); + vim_free(p); + return retval; + } +#endif + return _rmdir(name); +} + +/* * Return TRUE if file "fname" has more than one link. */ int diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro --- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -22,6 +22,7 @@ void mch_hide __ARGS((char_u *name)); int mch_ishidden __ARGS((char_u *name)); int mch_isdir __ARGS((char_u *name)); int mch_mkdir __ARGS((char_u *name)); +int mch_rmdir __ARGS((char_u *name)); int mch_is_hard_link __ARGS((char_u *fname)); int mch_is_symbolic_link __ARGS((char_u *fname)); int mch_is_linked __ARGS((char_u *fname)); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1109, +/**/ 1108, /**/ 1107,