updated for version 7.2a-009

diff --git a/src/main.c b/src/main.c
index 31c11c7846aa29163dced62f282b99d6529cf6af..53d18487961b72bb04ea271fb7d0ad6c65afc0a8 100644 (file)
--- 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)

diff --git a/src/os_unix.c b/src/os_unix.c
index ef73270da924c31079891a0b899db68f0b6aee69..871e274214d9132249bc1cbe8afd3da571163d5a 100644 (file)
--- 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 93b79578409775cf272fb2cee069d5cd5e46c26f..d51c8777b10067ea4b0699383ea311042f566a94 100644 (file)
--- 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,
 /**/