Skip to content

Commit 970de72

Browse files
committed
updated for version 7.3.378
Problem: When cross-compiling the check for uint32_t fails. Solution: Only give a warning message. (Maksim Melnikau)
1 parent f73c0a0 commit 970de72

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/auto/configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11777,7 +11777,8 @@ _ACEOF
1177711777
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
1177811778
$as_echo_n "checking uint32_t is 32 bits... " >&6; }
1177911779
if test "$cross_compiling" = yes; then :
11780-
as_fn_error "could not compile program using uint32_t." "$LINENO" 5
11780+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5
11781+
$as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;}
1178111782
else
1178211783
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1178311784
/* end confdefs.h. */

src/configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3283,7 +3283,7 @@ main() {
32833283
}],
32843284
AC_MSG_RESULT(ok),
32853285
AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]),
3286-
AC_MSG_ERROR([could not compile program using uint32_t.]))
3286+
AC_MSG_WARN([cannot check uint32_t when cross-compiling.]))
32873287

32883288
dnl Check for memmove() before bcopy(), makes memmove() be used when both are
32893289
dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ static char *(features[]) =
714714

715715
static int included_patches[] =
716716
{ /* Add new patch number below this line */
717+
/**/
718+
378,
717719
/**/
718720
377,
719721
/**/

0 commit comments

Comments
 (0)