diff options
| author | vimboss <devnull@localhost> | 2008-06-29 12:00:49 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2008-06-29 12:00:49 +0000 |
| commit | baf1ff81e37308b73de750848d69da7bb671d3b5 (patch) | |
| tree | 5488e5b457f1c0a997e047f9e582be7e28e5b9ae | |
| parent | d7c3ddf37c3d32a8ae53c9c8cee76bdd55b43507 (diff) | |
| download | vim-baf1ff81e37308b73de750848d69da7bb671d3b5.tar.gz | |
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | src/os_unix.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -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) diff --git a/src/os_unix.c b/src/os_unix.c index ef73270d..871e2742 100644 --- 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 diff --git a/src/version.c b/src/version.c index 93b79578..d51c8777 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 9, +/**/ 8, /**/ 7, |