Mercurial > vim

changeset 13420:f80abb797a32 v8.0.1584

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1584: using C99 in Mac file gives compiler warning messages commit https://github.com/vim/vim/commit/f536bf6d4518e2c66e635e39820d53f672021d87 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Mar 6 17:55:01 2018 +0100 patch 8.0.1584: using C99 in Mac file gives compiler warning messages Problem: Using C99 in Mac file gives compiler warning messages. Solution: Add #prama's to avoid the warnings. (Kazunobu Kuriyama)
author Christian Brabandt <cb@256bit.org>
date Tue, 06 Mar 2018 18:00:07 +0100
parents 219143fe5dcb
children 3cf79a7a4529
files src/os_macosx.m src/version.c
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -11,6 +11,14 @@
  * os_macosx.m -- Mac specific things for Mac OS X.
  */
 
+/* Suppress compiler warnings to non-C89 code. */
+#if defined(__clang__) && defined(__STRICT_ANSI__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wc99-extensions"
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeclaration-after-statement"
+#endif
+
 /* Avoid a conflict for the definition of Boolean between Mac header files and
  * X11 header files. */
 #define NO_X11_INCLUDES
@@ -189,3 +197,9 @@ releasepool:
 }
 
 #endif /* FEAT_CLIPBOARD */
+
+/* Lift the compiler warning suppression. */
+#if defined(__clang__) && defined(__STRICT_ANSI__)
+# pragma clang diagnostic pop
+# pragma clang diagnostic pop
+#endif
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1584,
+/**/
     1583,
 /**/
     1582,