diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-02 22:50:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-02 22:50:37 +0200 |
| commit | 5289783e0b07cfc3f92ee933261ca4c4acdca007 (patch) | |
| tree | bc7ed964d15c31e956628af851194908a48686a2 | |
| parent | 810af5ea460eab820cc5899892067d8c242be688 (diff) | |
| download | vim-git-5289783e0b07cfc3f92ee933261ca4c4acdca007.tar.gz | |
patch 8.2.1119: configure fails with Xcode 12 betav8.2.1119
Problem: Configure fails with Xcode 12 beta.
Solution: use "return" instead of "exit()". (Nico Weber, closes #6381)
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.ac | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index f642a0b5f..9c9a719d8 100755 --- 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 : diff --git a/src/configure.ac b/src/configure.ac index 054391882..19ce4c7a5 100644 --- 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.]), diff --git a/src/version.c b/src/version.c index c334ec686..ae2a95f46 100644 --- 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, |