fc1d4c1
To: vim-dev@vim.org
fc1d4c1
Subject: patch 7.1.108
fc1d4c1
Fcc: outbox
fc1d4c1
From: Bram Moolenaar <Bram@moolenaar.net>
fc1d4c1
Mime-Version: 1.0
fc1d4c1
Content-Type: text/plain; charset=ISO-8859-1
fc1d4c1
Content-Transfer-Encoding: 8bit
fc1d4c1
------------
fc1d4c1
fc1d4c1
Patch 7.1.108 (after 7.1.100)
fc1d4c1
Problem:    Win32: Compilation problems in Cscope code. (Jeff Lanzarotta)
fc1d4c1
Solution:   Use (long) instead of (intptr_t) when it's not defined.
fc1d4c1
Files:	    src/if_cscope.c
fc1d4c1
fc1d4c1
fc1d4c1
*** ../vim-7.1.107/src/if_cscope.c	Thu Sep  6 17:38:06 2007
fc1d4c1
--- src/if_cscope.c	Wed Sep 12 20:32:17 2007
fc1d4c1
***************
fc1d4c1
*** 726,731 ****
fc1d4c1
--- 726,740 ----
fc1d4c1
      HANDLE	stdin_rd, stdout_rd;
fc1d4c1
      HANDLE	stdout_wr, stdin_wr;
fc1d4c1
      BOOL	created;
fc1d4c1
+ # ifdef __BORLANDC__
fc1d4c1
+ #  define OPEN_OH_ARGTYPE long
fc1d4c1
+ # else
fc1d4c1
+ #  if (_MSC_VER >= 1300)
fc1d4c1
+ #   define OPEN_OH_ARGTYPE intptr_t
fc1d4c1
+ #  else
fc1d4c1
+ #   define OPEN_OH_ARGTYPE long
fc1d4c1
+ #  endif
fc1d4c1
+ # endif
fc1d4c1
  #endif
fc1d4c1
  
fc1d4c1
  #if defined(UNIX)
fc1d4c1
***************
fc1d4c1
*** 909,918 ****
fc1d4c1
      CloseHandle(pi.hThread);
fc1d4c1
  
fc1d4c1
      /* TODO - tidy up after failure to create files on pipe handles. */
fc1d4c1
!     if (((fd = _open_osfhandle((intptr_t)stdin_wr, _O_TEXT|_O_APPEND)) < 0)
fc1d4c1
  	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
fc1d4c1
  	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
fc1d4c1
!     if (((fd = _open_osfhandle((intptr_t)stdout_rd, _O_TEXT|_O_RDONLY)) < 0)
fc1d4c1
  	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
fc1d4c1
  	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
fc1d4c1
  
fc1d4c1
--- 918,929 ----
fc1d4c1
      CloseHandle(pi.hThread);
fc1d4c1
  
fc1d4c1
      /* TODO - tidy up after failure to create files on pipe handles. */
fc1d4c1
!     if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdin_wr,
fc1d4c1
! 						      _O_TEXT|_O_APPEND)) < 0)
fc1d4c1
  	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
fc1d4c1
  	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
fc1d4c1
!     if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdout_rd,
fc1d4c1
! 						      _O_TEXT|_O_RDONLY)) < 0)
fc1d4c1
  	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
fc1d4c1
  	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
fc1d4c1
  
fc1d4c1
*** ../vim-7.1.107/src/version.c	Thu Sep 13 22:40:47 2007
fc1d4c1
--- src/version.c	Fri Sep 14 19:55:12 2007
fc1d4c1
***************
fc1d4c1
*** 668,669 ****
fc1d4c1
--- 668,671 ----
fc1d4c1
  {   /* Add new patch number below this line */
fc1d4c1
+ /**/
fc1d4c1
+     108,
fc1d4c1
  /**/
fc1d4c1
fc1d4c1
-- 
fc1d4c1
Q:   How many hardware engineers does it take to change a lightbulb?
fc1d4c1
A:   None.  We'll fix it in software.
fc1d4c1
fc1d4c1
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
fc1d4c1
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
fc1d4c1
\\\        download, build and distribute -- http://www.A-A-P.org        ///
fc1d4c1
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///