You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.3 KiB

  1. From 5289783e0b07cfc3f92ee933261ca4c4acdca007 Mon Sep 17 00:00:00 2001
  2. From: Bram Moolenaar <Bram@vim.org>
  3. Date: Thu, 2 Jul 2020 22:50:37 +0200
  4. Subject: [PATCH] patch 8.2.1119: configure fails with Xcode 12 beta
  5. Problem: Configure fails with Xcode 12 beta.
  6. Solution: use "return" instead of "exit()". (Nico Weber, closes #6381)
  7. ---
  8. src/auto/configure | 4 ++--
  9. src/configure.ac | 4 ++--
  10. src/version.c | 2 ++
  11. 3 files changed, 6 insertions(+), 4 deletions(-)
  12. --- a/src/auto/configure
  13. +++ b/src/auto/configure
  14. @@ -14005,8 +14005,8 @@ else
  15. main() {
  16. uint32_t nr1 = (uint32_t)-1;
  17. uint32_t nr2 = (uint32_t)0xffffffffUL;
  18. - if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
  19. - exit(0);
  20. + if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
  21. + return 0;
  22. }
  23. _ACEOF
  24. if ac_fn_c_try_run "$LINENO"; then :
  25. --- a/src/configure.ac
  26. +++ b/src/configure.ac
  27. @@ -4129,8 +4129,8 @@ AC_TRY_RUN([
  28. main() {
  29. uint32_t nr1 = (uint32_t)-1;
  30. uint32_t nr2 = (uint32_t)0xffffffffUL;
  31. - if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
  32. - exit(0);
  33. + if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) return 1;
  34. + return 0;
  35. }],
  36. AC_MSG_RESULT(ok),
  37. AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]),