projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d034a75d AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.378 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.378 | |
| 11 | Problem: When cross-compiling the check for uint32_t fails. | |
| 12 | Solution: Only give a warning message. (Maksim Melnikau) | |
| 13 | Files: src/configure.in, src/auto/configure | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.377/src/configure.in 2011-12-08 15:17:28.000000000 +0100 | |
| 17 | --- src/configure.in 2011-12-14 19:18:36.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 3283,3289 **** | |
| 20 | }], | |
| 21 | AC_MSG_RESULT(ok), | |
| 22 | AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]), | |
| 23 | ! AC_MSG_ERROR([could not compile program using uint32_t.])) | |
| 24 | ||
| 25 | dnl Check for memmove() before bcopy(), makes memmove() be used when both are | |
| 26 | dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5. | |
| 27 | --- 3283,3289 ---- | |
| 28 | }], | |
| 29 | AC_MSG_RESULT(ok), | |
| 30 | AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]), | |
| 31 | ! AC_MSG_WARN([cannot check uint32_t when cross-compiling.])) | |
| 32 | ||
| 33 | dnl Check for memmove() before bcopy(), makes memmove() be used when both are | |
| 34 | dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5. | |
| 35 | *** ../vim-7.3.377/src/auto/configure 2011-12-08 15:17:28.000000000 +0100 | |
| 36 | --- src/auto/configure 2011-12-14 19:20:55.000000000 +0100 | |
| 37 | *************** | |
| 38 | *** 11777,11783 **** | |
| 39 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 | |
| 40 | $as_echo_n "checking uint32_t is 32 bits... " >&6; } | |
| 41 | if test "$cross_compiling" = yes; then : | |
| 42 | ! as_fn_error "could not compile program using uint32_t." "$LINENO" 5 | |
| 43 | else | |
| 44 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| 45 | /* end confdefs.h. */ | |
| 46 | --- 11777,11784 ---- | |
| 47 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 | |
| 48 | $as_echo_n "checking uint32_t is 32 bits... " >&6; } | |
| 49 | if test "$cross_compiling" = yes; then : | |
| 50 | ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5 | |
| 51 | ! $as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;} | |
| 52 | else | |
| 53 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| 54 | /* end confdefs.h. */ | |
| 55 | *** ../vim-7.3.377/src/version.c 2011-12-14 15:32:44.000000000 +0100 | |
| 56 | --- src/version.c 2011-12-14 19:21:08.000000000 +0100 | |
| 57 | *************** | |
| 58 | *** 716,717 **** | |
| 59 | --- 716,719 ---- | |
| 60 | { /* Add new patch number below this line */ | |
| 61 | + /**/ | |
| 62 | + 378, | |
| 63 | /**/ | |
| 64 | ||
| 65 | -- | |
| 66 | ### Hiroshima 45, Chernobyl 86, Windows 95 ### | |
| 67 | ||
| 68 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 69 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 70 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 71 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |