f301e86
To: vim-dev@vim.org
f301e86
Subject: Patch 7.0.007
f301e86
Fcc: outbox
f301e86
From: Bram Moolenaar <Bram@moolenaar.net>
f301e86
Mime-Version: 1.0
f301e86
Content-Type: text/plain; charset=ISO-8859-1
f301e86
Content-Transfer-Encoding: 8bit
f301e86
------------
f301e86
f301e86
Patch 7.0.007
f301e86
Problem:    AIX: compiling fails for message.c. (Ruediger Hornig)
f301e86
Solution:   Move the #if outside of memchr().
f301e86
Files:	    src/message.c
f301e86
f301e86
f301e86
*** ../vim-7.0.006/src/message.c	Wed May 10 15:22:50 2006
f301e86
--- src/message.c	Tue May  9 10:36:56 2006
f301e86
***************
f301e86
*** 4175,4189 ****
f301e86
  			str_arg_l = 0;
f301e86
  		    else
f301e86
  		    {
f301e86
! 			/* memchr on HP does not like n > 2^31  !!! */
f301e86
! 			char *q = memchr(str_arg, '\0',
f301e86
  #if SIZEOF_INT <= 2
f301e86
! 				precision
f301e86
  #else
f301e86
! 				precision <= (size_t)0x7fffffffL ? precision
f301e86
! 						       : (size_t)0x7fffffffL
f301e86
  #endif
f301e86
- 						       );
f301e86
  			str_arg_l = (q == NULL) ? precision : q - str_arg;
f301e86
  		    }
f301e86
  		    break;
f301e86
--- 4175,4190 ----
f301e86
  			str_arg_l = 0;
f301e86
  		    else
f301e86
  		    {
f301e86
! 			/* Don't put the #if inside memchr(), it can be a
f301e86
! 			 * macro. */
f301e86
  #if SIZEOF_INT <= 2
f301e86
! 			char *q = memchr(str_arg, '\0', precision);
f301e86
  #else
f301e86
! 			/* memchr on HP does not like n > 2^31  !!! */
f301e86
! 			char *q = memchr(str_arg, '\0',
f301e86
! 				  precision <= (size_t)0x7fffffffL ? precision
f301e86
! 						       : (size_t)0x7fffffffL);
f301e86
  #endif
f301e86
  			str_arg_l = (q == NULL) ? precision : q - str_arg;
f301e86
  		    }
f301e86
  		    break;
f301e86
*** ../vim-7.0.006/src/version.c	Wed May 10 17:26:37 2006
f301e86
--- src/version.c	Wed May 10 17:36:03 2006
f301e86
***************
f301e86
*** 668,669 ****
f301e86
--- 668,671 ----
f301e86
  {   /* Add new patch number below this line */
f301e86
+ /**/
f301e86
+     7,
f301e86
  /**/
f301e86
f301e86
-- 
f301e86
Momento mori, ergo carpe diem
f301e86
f301e86
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
f301e86
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
f301e86
\\\        download, build and distribute -- http://www.A-A-P.org        ///
f301e86
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///