Mirror of the Vim source from https://github.com/vim/vim
Revision | b4791bb4fbff451efa3ffdabd4e26a668eda2283 (tree) |
---|---|
Time | 2007-09-15 02:56:59 |
Author | vimboss |
Commiter | vimboss |
updated for version 7.1-108
@@ -726,6 +726,15 @@ | ||
726 | 726 | HANDLE stdin_rd, stdout_rd; |
727 | 727 | HANDLE stdout_wr, stdin_wr; |
728 | 728 | BOOL created; |
729 | +# ifdef __BORLANDC__ | |
730 | +# define OPEN_OH_ARGTYPE long | |
731 | +# else | |
732 | +# if (_MSC_VER >= 1300) | |
733 | +# define OPEN_OH_ARGTYPE intptr_t | |
734 | +# else | |
735 | +# define OPEN_OH_ARGTYPE long | |
736 | +# endif | |
737 | +# endif | |
729 | 738 | #endif |
730 | 739 | |
731 | 740 | #if defined(UNIX) |
@@ -909,10 +918,12 @@ | ||
909 | 918 | CloseHandle(pi.hThread); |
910 | 919 | |
911 | 920 | /* TODO - tidy up after failure to create files on pipe handles. */ |
912 | - if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0) | |
921 | + if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdin_wr, | |
922 | + _O_TEXT|_O_APPEND)) < 0) | |
913 | 923 | || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL)) |
914 | 924 | PERROR(_("cs_create_connection: fdopen for to_fp failed")); |
915 | - if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0) | |
925 | + if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdout_rd, | |
926 | + _O_TEXT|_O_RDONLY)) < 0) | |
916 | 927 | || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL)) |
917 | 928 | PERROR(_("cs_create_connection: fdopen for fr_fp failed")); |
918 | 929 |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 108, | |
671 | +/**/ | |
670 | 672 | 107, |
671 | 673 | /**/ |
672 | 674 | 106, |