From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 14 Dec 2011 18:22:34 +0000 (+0100)
Subject: updated for version 7.3.378
X-Git-Tag: v7.3.378
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=323cb95120f8e0ba0116ddd87dda7956f80d7388;p=thirdparty%2Fvim.git

updated for version 7.3.378
Problem:    When cross-compiling the check for uint32_t fails.
Solution:   Only give a warning message. (Maksim Melnikau)
---

diff --git a/src/auto/configure b/src/auto/configure
index ff2e13b21d..8b7279225a 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -11777,7 +11777,8 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
 $as_echo_n "checking uint32_t is 32 bits... " >&6; }
 if test "$cross_compiling" = yes; then :
-  as_fn_error "could not compile program using uint32_t." "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5
+$as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;}
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/configure.in b/src/configure.in
index 7a2b186afb..8e3aa8db50 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -3283,7 +3283,7 @@ main() {
 }],
 AC_MSG_RESULT(ok),
 AC_MSG_ERROR([WRONG!  uint32_t not defined correctly.]),
-AC_MSG_ERROR([could not compile program using uint32_t.]))
+AC_MSG_WARN([cannot check uint32_t when cross-compiling.]))
 
 dnl Check for memmove() before bcopy(), makes memmove() be used when both are
 dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
diff --git a/src/version.c b/src/version.c
index 6fa74b43f3..16abb870d9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    378,
 /**/
     377,
 /**/