Blame SOURCES/7.4.044

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