Mercurial > vim

changeset 21136:228a3719c49f v8.2.1119

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1119: configure fails with Xcode 12 beta Commit: https://github.com/vim/vim/commit/5289783e0b07cfc3f92ee933261ca4c4acdca007 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 2 22:50:37 2020 +0200 patch 8.2.1119: configure fails with Xcode 12 beta Problem: Configure fails with Xcode 12 beta. Solution: use "return" instead of "exit()". (Nico Weber, closes https://github.com/vim/vim/issues/6381)
author Bram Moolenaar <Bram@vim.org>
date Thu, 02 Jul 2020 23:00:04 +0200
parents 40d745f5484b
children dd37ab39bac8
files src/auto/configure src/configure.ac src/version.c
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14143,8 +14143,8 @@ else
 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);
+  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
+  return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4151,8 +4151,8 @@ AC_TRY_RUN([
 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);
+  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.]),
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1119,
+/**/
     1118,
 /**/
     1117,