Mercurial > vim
changeset 1657:c3e225bc213a v7.2a.009
updated for version 7.2a-009
| author | vimboss |
|---|---|
| date | Sun, 29 Jun 2008 12:00:49 +0000 |
| parents | eb6fc577c96c |
| children | 630eca9496e0 |
| files | src/main.c src/os_unix.c src/version.c |
| diffstat | 3 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -20,7 +20,9 @@ #ifdef __CYGWIN__ # ifndef WIN32 -# include <sys/cygwin.h> /* for cygwin_conv_to_posix_path() */ +# include <cygwin/version.h> +# include <sys/cygwin.h> /* for cygwin_conv_to_posix_path() and/or + * cygwin_conv_path() */ # endif # include <limits.h> #endif @@ -2213,7 +2215,11 @@ scripterror: { char posix_path[PATH_MAX]; +# if CYGWIN_VERSION_DLL_MAJOR >= 1007 + cygwin_conv_path(CCP_WIN_A_TO_POSIX, p, posix_path, PATH_MAX); +# else cygwin_conv_to_posix_path(p, posix_path); +# endif vim_free(p); p = vim_strsave(posix_path); if (p == NULL)
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -58,7 +58,9 @@ static int selinux_enabled = -1; #ifdef __CYGWIN__ # ifndef WIN32 -# include <sys/cygwin.h> /* for cygwin_conv_to_posix_path() */ +# include <cygwin/version.h> +# include <sys/cygwin.h> /* for cygwin_conv_to_posix_path() and/or + * for cygwin_conv_path() */ # endif #endif @@ -2312,7 +2314,11 @@ mch_FullName(fname, buf, len, force) /* * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts". */ +# if CYGWIN_VERSION_DLL_MAJOR >= 1007 + cygwin_conv_path(CCP_WIN_A_TO_POSIX, fname, posix_fname, MAXPATHL); +# else cygwin_conv_to_posix_path(fname, posix_fname); +# endif fname = posix_fname; #endif