]> granicus.if.org Git - vim/commitdiff
updated for version 7.1-108 v7.1.108
authorBram Moolenaar <Bram@vim.org>
Fri, 14 Sep 2007 17:56:59 +0000 (17:56 +0000)
committerBram Moolenaar <Bram@vim.org>
Fri, 14 Sep 2007 17:56:59 +0000 (17:56 +0000)
src/if_cscope.c
src/version.c

index 151dc91e056ddd367733358c5fcc94741c1a3bd9..52aa53401448b3bbb4088e2a016cfd135f3eac70 100644 (file)
@@ -726,6 +726,15 @@ cs_create_connection(i)
     HANDLE     stdin_rd, stdout_rd;
     HANDLE     stdout_wr, stdin_wr;
     BOOL       created;
+# ifdef __BORLANDC__
+#  define OPEN_OH_ARGTYPE long
+# else
+#  if (_MSC_VER >= 1300)
+#   define OPEN_OH_ARGTYPE intptr_t
+#  else
+#   define OPEN_OH_ARGTYPE long
+#  endif
+# endif
 #endif
 
 #if defined(UNIX)
@@ -909,10 +918,12 @@ err_closing:
     CloseHandle(pi.hThread);
 
     /* TODO - tidy up after failure to create files on pipe handles. */
-    if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0)
+    if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdin_wr,
+                                                     _O_TEXT|_O_APPEND)) < 0)
            || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
        PERROR(_("cs_create_connection: fdopen for to_fp failed"));
-    if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0)
+    if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdout_rd,
+                                                     _O_TEXT|_O_RDONLY)) < 0)
            || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
        PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
 
index 097284a9bcb2a954e523fbfe10cc8c65bf104e72..04ca162d8da3a06b8799a16513ab239607ef835a 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    108,
 /**/
     107,
 /**/