8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.044
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.044 (after 7.4.039)
8b9a1c
Problem:    Can't build with old MSVC. (Wang Shoulin)
8b9a1c
Solution:   Define OPEN_OH_ARGTYPE instead of using intptr_t directly.
8b9a1c
Files:	    src/os_mswin.c
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.043/src/os_mswin.c	2013-09-25 19:13:32.000000000 +0200
8b9a1c
--- src/os_mswin.c	2013-09-26 20:37:38.000000000 +0200
8b9a1c
***************
8b9a1c
*** 498,503 ****
8b9a1c
--- 498,509 ----
8b9a1c
      }
8b9a1c
  }
8b9a1c
  
8b9a1c
+ #if (_MSC_VER >= 1300)
8b9a1c
+ # define OPEN_OH_ARGTYPE intptr_t
8b9a1c
+ #else
8b9a1c
+ # define OPEN_OH_ARGTYPE long
8b9a1c
+ #endif
8b9a1c
+ 
8b9a1c
      static int
8b9a1c
  stat_symlink_aware(const char *name, struct stat *stp)
8b9a1c
  {
8b9a1c
***************
8b9a1c
*** 533,539 ****
8b9a1c
  	{
8b9a1c
  	    int	    fd, n;
8b9a1c
  
8b9a1c
! 	    fd = _open_osfhandle((intptr_t)h, _O_RDONLY);
8b9a1c
  	    n = _fstat(fd, (struct _stat*)stp);
8b9a1c
  	    _close(fd);
8b9a1c
  	    return n;
8b9a1c
--- 539,545 ----
8b9a1c
  	{
8b9a1c
  	    int	    fd, n;
8b9a1c
  
8b9a1c
! 	    fd = _open_osfhandle((OPEN_OH_ARGTYPE)h, _O_RDONLY);
8b9a1c
  	    n = _fstat(fd, (struct _stat*)stp);
8b9a1c
  	    _close(fd);
8b9a1c
  	    return n;
8b9a1c
***************
8b9a1c
*** 580,586 ****
8b9a1c
  	{
8b9a1c
  	    int	    fd;
8b9a1c
  
8b9a1c
! 	    fd = _open_osfhandle((intptr_t)h, _O_RDONLY);
8b9a1c
  	    n = _fstat(fd, stp);
8b9a1c
  	    _close(fd);
8b9a1c
  	    return n;
8b9a1c
--- 586,592 ----
8b9a1c
  	{
8b9a1c
  	    int	    fd;
8b9a1c
  
8b9a1c
! 	    fd = _open_osfhandle((OPEN_OH_ARGTYPE)h, _O_RDONLY);
8b9a1c
  	    n = _fstat(fd, stp);
8b9a1c
  	    _close(fd);
8b9a1c
  	    return n;
8b9a1c
*** ../vim-7.4.043/src/version.c	2013-09-29 16:27:42.000000000 +0200
8b9a1c
--- src/version.c	2013-09-29 18:27:58.000000000 +0200
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     44,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
I'd like to meet the man who invented sex and see what he's working on now.
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///