thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1119: configure fails with Xcode 12 beta

Browse Source 
Problem:    Configure fails with Xcode 12 beta.
Solution:   use "return" instead of "exit()". (Nico Weber, closes #6381)
This commit is contained in:
Bram Moolenaar
2020-07-02 22:50:37 +02:00
parent 810af5ea46
commit 5289783e0b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auto/configure vendored
View File

@@ -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 :

4
src/configure.ac
View File

@@ -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.]),

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1119,
/**/
1118,
/**/