From: Bram Moolenaar Date: Fri, 14 Sep 2007 17:56:59 +0000 (+0000) Subject: updated for version 7.1-108 X-Git-Tag: v7.1.108 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5365c4d5905a5d233c5609ce9bef9eafa4f43b02;p=vim updated for version 7.1-108 --- diff --git a/src/if_cscope.c b/src/if_cscope.c index 151dc91e0..52aa53401 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -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")); diff --git a/src/version.c b/src/version.c index 097284a9b..04ca162d8 100644 --- a/src/version.c +++ b/src/version.c @@ -666,6 +666,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 108, /**/ 107, /**/