29bed37
To: vim_dev@googlegroups.com
29bed37
Subject: Patch 7.3.378
29bed37
Fcc: outbox
29bed37
From: Bram Moolenaar <Bram@moolenaar.net>
29bed37
Mime-Version: 1.0
29bed37
Content-Type: text/plain; charset=UTF-8
29bed37
Content-Transfer-Encoding: 8bit
29bed37
------------
29bed37
29bed37
Patch 7.3.378
29bed37
Problem:    When cross-compiling the check for uint32_t fails.
29bed37
Solution:   Only give a warning message. (Maksim Melnikau)
29bed37
Files:      src/configure.in, src/auto/configure
29bed37
29bed37
29bed37
*** ../vim-7.3.377/src/configure.in	2011-12-08 15:17:28.000000000 +0100
29bed37
--- src/configure.in	2011-12-14 19:18:36.000000000 +0100
29bed37
***************
29bed37
*** 3283,3289 ****
29bed37
  }],
29bed37
  AC_MSG_RESULT(ok),
29bed37
  AC_MSG_ERROR([WRONG!  uint32_t not defined correctly.]),
29bed37
! AC_MSG_ERROR([could not compile program using uint32_t.]))
29bed37
  
29bed37
  dnl Check for memmove() before bcopy(), makes memmove() be used when both are
29bed37
  dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
29bed37
--- 3283,3289 ----
29bed37
  }],
29bed37
  AC_MSG_RESULT(ok),
29bed37
  AC_MSG_ERROR([WRONG!  uint32_t not defined correctly.]),
29bed37
! AC_MSG_WARN([cannot check uint32_t when cross-compiling.]))
29bed37
  
29bed37
  dnl Check for memmove() before bcopy(), makes memmove() be used when both are
29bed37
  dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
29bed37
*** ../vim-7.3.377/src/auto/configure	2011-12-08 15:17:28.000000000 +0100
29bed37
--- src/auto/configure	2011-12-14 19:20:55.000000000 +0100
29bed37
***************
29bed37
*** 11777,11783 ****
29bed37
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
29bed37
  $as_echo_n "checking uint32_t is 32 bits... " >&6; }
29bed37
  if test "$cross_compiling" = yes; then :
29bed37
!   as_fn_error "could not compile program using uint32_t." "$LINENO" 5
29bed37
  else
29bed37
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
29bed37
  /* end confdefs.h.  */
29bed37
--- 11777,11784 ----
29bed37
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
29bed37
  $as_echo_n "checking uint32_t is 32 bits... " >&6; }
29bed37
  if test "$cross_compiling" = yes; then :
29bed37
!   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5
29bed37
! $as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;}
29bed37
  else
29bed37
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
29bed37
  /* end confdefs.h.  */
29bed37
*** ../vim-7.3.377/src/version.c	2011-12-14 15:32:44.000000000 +0100
29bed37
--- src/version.c	2011-12-14 19:21:08.000000000 +0100
29bed37
***************
29bed37
*** 716,717 ****
29bed37
--- 716,719 ----
29bed37
  {   /* Add new patch number below this line */
29bed37
+ /**/
29bed37
+     378,
29bed37
  /**/
29bed37
29bed37
-- 
29bed37
            ### Hiroshima 45, Chernobyl 86, Windows 95 ###
29bed37
29bed37
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
29bed37
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
29bed37
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
29bed37
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///