projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c0949972 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.108 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.108 (after 7.1.100) | |
| 11 | Problem: Win32: Compilation problems in Cscope code. (Jeff Lanzarotta) | |
| 12 | Solution: Use (long) instead of (intptr_t) when it's not defined. | |
| 13 | Files: src/if_cscope.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.107/src/if_cscope.c Thu Sep 6 17:38:06 2007 | |
| 17 | --- src/if_cscope.c Wed Sep 12 20:32:17 2007 | |
| 18 | *************** | |
| 19 | *** 726,731 **** | |
| 20 | --- 726,740 ---- | |
| 21 | HANDLE stdin_rd, stdout_rd; | |
| 22 | HANDLE stdout_wr, stdin_wr; | |
| 23 | BOOL created; | |
| 24 | + # ifdef __BORLANDC__ | |
| 25 | + # define OPEN_OH_ARGTYPE long | |
| 26 | + # else | |
| 27 | + # if (_MSC_VER >= 1300) | |
| 28 | + # define OPEN_OH_ARGTYPE intptr_t | |
| 29 | + # else | |
| 30 | + # define OPEN_OH_ARGTYPE long | |
| 31 | + # endif | |
| 32 | + # endif | |
| 33 | #endif | |
| 34 | ||
| 35 | #if defined(UNIX) | |
| 36 | *************** | |
| 37 | *** 909,918 **** | |
| 38 | CloseHandle(pi.hThread); | |
| 39 | ||
| 40 | /* TODO - tidy up after failure to create files on pipe handles. */ | |
| 41 | ! if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0) | |
| 42 | || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL)) | |
| 43 | PERROR(_("cs_create_connection: fdopen for to_fp failed")); | |
| 44 | ! if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0) | |
| 45 | || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL)) | |
| 46 | PERROR(_("cs_create_connection: fdopen for fr_fp failed")); | |
| 47 | ||
| 48 | --- 918,929 ---- | |
| 49 | CloseHandle(pi.hThread); | |
| 50 | ||
| 51 | /* TODO - tidy up after failure to create files on pipe handles. */ | |
| 52 | ! if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdin_wr, | |
| 53 | ! _O_TEXT|_O_APPEND)) < 0) | |
| 54 | || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL)) | |
| 55 | PERROR(_("cs_create_connection: fdopen for to_fp failed")); | |
| 56 | ! if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdout_rd, | |
| 57 | ! _O_TEXT|_O_RDONLY)) < 0) | |
| 58 | || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL)) | |
| 59 | PERROR(_("cs_create_connection: fdopen for fr_fp failed")); | |
| 60 | ||
| 61 | *** ../vim-7.1.107/src/version.c Thu Sep 13 22:40:47 2007 | |
| 62 | --- src/version.c Fri Sep 14 19:55:12 2007 | |
| 63 | *************** | |
| 64 | *** 668,669 **** | |
| 65 | --- 668,671 ---- | |
| 66 | { /* Add new patch number below this line */ | |
| 67 | + /**/ | |
| 68 | + 108, | |
| 69 | /**/ | |
| 70 | ||
| 71 | -- | |
| 72 | Q: How many hardware engineers does it take to change a lightbulb? | |
| 73 | A: None. We'll fix it in software. | |
| 74 | ||
| 75 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 76 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 77 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 78 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |