diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-09-14 17:56:59 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-09-14 17:56:59 +0000 |
| commit | 5365c4d5905a5d233c5609ce9bef9eafa4f43b02 (patch) | |
| tree | 62bb190340d65f607d8d033542f88112289c9955 | |
| parent | 53241daeba2eaca436cb9356f590ee8209f86a81 (diff) | |
updated for version 7.1-108v7.1.108
| -rw-r--r-- | src/if_cscope.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c index 151dc91e05..52aa534014 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 097284a9bc..04ca162d8d 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 108, +/**/ 107, /**/ 106, |