To: vim_dev@googlegroups.com Subject: Patch 8.2.1119 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1119 Problem: Configure fails with Xcode 12 beta. Solution: use "return" instead of "exit()". (Nico Weber, closes #6381) Files: src/configure.ac, src/auto/configure *** ../vim-8.2.1118/src/configure.ac 2020-06-16 20:03:38.743351051 +0200 --- src/configure.ac 2020-07-02 22:46:46.856564181 +0200 *************** *** 4151,4158 **** main() { uint32_t nr1 = (uint32_t)-1; uint32_t nr2 = (uint32_t)0xffffffffUL; ! if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1); ! exit(0); }], AC_MSG_RESULT(ok), AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]), --- 4151,4158 ---- main() { uint32_t nr1 = (uint32_t)-1; uint32_t nr2 = (uint32_t)0xffffffffUL; ! if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1; ! return 0; }], AC_MSG_RESULT(ok), AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]), *** ../vim-8.2.1118/src/auto/configure 2020-06-16 20:03:38.743351051 +0200 --- src/auto/configure 2020-07-02 22:48:32.143871846 +0200 *************** *** 14143,14150 **** main() { uint32_t nr1 = (uint32_t)-1; uint32_t nr2 = (uint32_t)0xffffffffUL; ! if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1); ! exit(0); } _ACEOF if ac_fn_c_try_run "$LINENO"; then : --- 14143,14150 ---- main() { uint32_t nr1 = (uint32_t)-1; uint32_t nr2 = (uint32_t)0xffffffffUL; ! if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1; ! return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : *** ../vim-8.2.1118/src/version.c 2020-07-02 21:23:38.641427657 +0200 --- src/version.c 2020-07-02 22:48:04.304053882 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1119, /**/ -- BLACK KNIGHT: None shall pass. ARTHUR: I have no quarrel with you, brave Sir knight, but I must cross this bridge. BLACK KNIGHT: Then you shall die. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///