summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip H <47042125+pheiduck@users.noreply.github.com>2022-11-04 22:32:21 +0000
committerBram Moolenaar <Bram@vim.org>2022-11-04 22:32:21 +0000
commit5375205761b5ed247f992abce341cf745dded38d (patch)
tree19f21989b2a21df9f0f018b0f7e3d14626c1ebc7
parent3d19c81a116e7923d8295e7d2795fb3edb45acb1 (diff)
downloadvim-git-5375205761b5ed247f992abce341cf745dded38d.tar.gz
patch 9.0.0830: compiling with Perl on Mac 12 failsv9.0.0830
Problem: Compiling with Perl on Mac 12 fails. Solution: Suppress infinite warnings. (closes #11499)
-rw-r--r--src/if_perl.xs5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 0241c319f..08e0e02f3 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -145,6 +145,11 @@
# define EXTERN_C
#endif
+// Suppress Infinite warnings when compiling XS modules under macOS 12 Monterey.
+#if defined(__clang__) && defined(__clang_major__) && __clang_major__ > 11
+#pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
+#endif
+
/* Compatibility hacks over */
static PerlInterpreter *perl_interp = NULL;
diff --git a/src/version.c b/src/version.c
index 2364d1275..a914e78af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 830,
+/**/
829,
/**/
828,