Blame SOURCES/7.4.044

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