Merge remote-tracking branch 'origin/master' into feature/android

d63ee136 · Po Lu · 0900bfbc · 8b87d095 · d63ee136
Commit d63ee136 authored Jan 25, 2023 by Po Lu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/coding.c src/coding.c +1 -1

No files found.
--- a/src/coding.c
+++ b/src/coding.c
@@ -653,7 +653,7 @@ growable_destination (struct coding_system *coding)

 /* Suppress clang warnings about consumed_chars never being used.
   Although correct, the warnings are too much trouble to code around.  */
-#if 13 <= __clang_major__
+#if 13 <= __clang_major__ - defined __apple_build_version__
 # pragma clang diagnostic ignored "-Wunused-but-set-variable"
 #endif