astepano / rpms / vim

Forked from rpms/vim 6 years ago
Clone
b85d1b3
To: vim-dev@vim.org
b85d1b3
Subject: patch 7.1.034
b85d1b3
Fcc: outbox
b85d1b3
From: Bram Moolenaar <Bram@moolenaar.net>
b85d1b3
Mime-Version: 1.0
b85d1b3
Content-Type: text/plain; charset=ISO-8859-1
b85d1b3
Content-Transfer-Encoding: 8bit
b85d1b3
------------
b85d1b3
b85d1b3
Patch 7.1.034
b85d1b3
Problem:    Win64: A few compiler warnings.  Problems with optimizer.
b85d1b3
Solution:   Use int instead of size_t.  Disable the optimizer in one function.
b85d1b3
	    (George V.  Reilly)
b85d1b3
Files:	    src/eval.c, src/spell.c
b85d1b3
b85d1b3
b85d1b3
*** ../vim-7.1.033/src/eval.c	Tue Jul 17 16:31:15 2007
b85d1b3
--- src/eval.c	Wed Jul 11 19:50:27 2007
b85d1b3
***************
b85d1b3
*** 992,1011 ****
b85d1b3
      char_u	*value;
b85d1b3
      int		value_len;
b85d1b3
  {
b85d1b3
!     size_t	len;
b85d1b3
  
b85d1b3
      if (redir_lval == NULL)
b85d1b3
  	return;
b85d1b3
  
b85d1b3
      if (value_len == -1)
b85d1b3
! 	len = STRLEN(value);	/* Append the entire string */
b85d1b3
      else
b85d1b3
! 	len = value_len;	/* Append only "value_len" characters */
b85d1b3
  
b85d1b3
!     if (ga_grow(&redir_ga, (int)len) == OK)
b85d1b3
      {
b85d1b3
  	mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
b85d1b3
! 	redir_ga.ga_len += (int)len;
b85d1b3
      }
b85d1b3
      else
b85d1b3
  	var_redir_stop();
b85d1b3
--- 992,1011 ----
b85d1b3
      char_u	*value;
b85d1b3
      int		value_len;
b85d1b3
  {
b85d1b3
!     int		len;
b85d1b3
  
b85d1b3
      if (redir_lval == NULL)
b85d1b3
  	return;
b85d1b3
  
b85d1b3
      if (value_len == -1)
b85d1b3
! 	len = (int)STRLEN(value);	/* Append the entire string */
b85d1b3
      else
b85d1b3
! 	len = value_len;		/* Append only "value_len" characters */
b85d1b3
  
b85d1b3
!     if (ga_grow(&redir_ga, len) == OK)
b85d1b3
      {
b85d1b3
  	mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
b85d1b3
! 	redir_ga.ga_len += len;
b85d1b3
      }
b85d1b3
      else
b85d1b3
  	var_redir_stop();
b85d1b3
*** ../vim-7.1.033/src/spell.c	Thu May 10 18:45:53 2007
b85d1b3
--- src/spell.c	Sat Jul 14 17:17:52 2007
b85d1b3
***************
b85d1b3
*** 7829,7835 ****
b85d1b3
  # if (_MSC_VER <= 1200)
b85d1b3
  /* This line is required for VC6 without the service pack.  Also see the
b85d1b3
   * matching #pragma below. */
b85d1b3
! /* # pragma optimize("", off) */
b85d1b3
  # endif
b85d1b3
  #endif
b85d1b3
  
b85d1b3
--- 7829,7835 ----
b85d1b3
  # if (_MSC_VER <= 1200)
b85d1b3
  /* This line is required for VC6 without the service pack.  Also see the
b85d1b3
   * matching #pragma below. */
b85d1b3
!  #  pragma optimize("", off)
b85d1b3
  # endif
b85d1b3
  #endif
b85d1b3
  
b85d1b3
***************
b85d1b3
*** 7859,7865 ****
b85d1b3
  
b85d1b3
  #ifdef _MSC_VER
b85d1b3
  # if (_MSC_VER <= 1200)
b85d1b3
! /* # pragma optimize("", on) */
b85d1b3
  # endif
b85d1b3
  #endif
b85d1b3
  
b85d1b3
--- 7859,7865 ----
b85d1b3
  
b85d1b3
  #ifdef _MSC_VER
b85d1b3
  # if (_MSC_VER <= 1200)
b85d1b3
!  #  pragma optimize("", on)
b85d1b3
  # endif
b85d1b3
  #endif
b85d1b3
  
b85d1b3
*** ../vim-7.1.033/src/version.c	Tue Jul 24 09:50:22 2007
b85d1b3
--- src/version.c	Tue Jul 24 09:47:17 2007
b85d1b3
***************
b85d1b3
*** 668,669 ****
b85d1b3
--- 668,671 ----
b85d1b3
  {   /* Add new patch number below this line */
b85d1b3
+ /**/
b85d1b3
+     34,
b85d1b3
  /**/
b85d1b3
b85d1b3
-- 
b85d1b3
How To Keep A Healthy Level Of Insanity:
b85d1b3
17. When the money comes out the ATM, scream "I won!, I won! 3rd
b85d1b3
    time this week!!!!!"
b85d1b3
b85d1b3
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
b85d1b3
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
b85d1b3
\\\        download, build and distribute -- http://www.A-A-P.org        ///
b85d1b3
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///