From 0d1498ea69faad513f7e55c74c220990f9d89996 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 29 Jun 2008 12:00:49 +0000 Subject: [PATCH] updated for version 7.2a-009 --- src/main.c | 8 +++++++- src/os_unix.c | 8 +++++++- src/version.c | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 31c11c7846..53d1848796 100644 --- a/src/main.c +++ b/src/main.c @@ -20,7 +20,9 @@ #ifdef __CYGWIN__ # ifndef WIN32 -# include /* for cygwin_conv_to_posix_path() */ +# include +# include /* for cygwin_conv_to_posix_path() and/or + * cygwin_conv_path() */ # endif # include #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 ef73270da9..871e274214 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 /* for cygwin_conv_to_posix_path() */ +# include +# include /* 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 93b7957840..d51c8777b1 100644 --- a/src/version.c +++ b/src/version.c @@ -676,6 +676,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 9, /**/ 8, /**/