commit 952d9d827e5bfc66a6b1d39956e4e5596b09e2bd
author Bram Moolenaar <Bram@vim.org> Mon Aug 02 18:07:18 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Aug 02 18:07:18 2021 +0200
tree 0b2581eeaec39b6bad25b58f537d8ea1e893b79c
parent 1321257317b7d28228a6a9a0d612f81f70290b4c

patch 8.2.3274: macro for printf format check can be simplified

Problem:    Macro for printf format check can be simplified.
Solution:   Add ATTRIBUTE_FORMAT_PRINTF(). (Dominique Pellé, issue #8635)

src/vim.h

diff --git a/src/vim.h b/src/vim.h
index 7d23986..b9105b5 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2132,8 +2132,21 @@
 typedef struct stat stat_T;
 #endif
 
-#if defined(__GNUC__) && !defined(__MINGW32__)
-# define USE_PRINTF_FORMAT_ATTRIBUTE
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(__MINGW32__)
+# define ATTRIBUTE_FORMAT_PRINTF(fmt_idx, arg_idx) \
+    __attribute__((format(printf, fmt_idx, arg_idx)))
+#else
+# define ATTRIBUTE_FORMAT_PRINTF(fmt_idx, arg_idx)
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+# define likely(x)      __builtin_expect((x), 1)
+# define unlikely(x)    __builtin_expect((x), 0)
+# define ATTRIBUTE_COLD __attribute__((cold))
+#else
+# define unlikely(x)  (x)
+# define likely(x)    (x)
+# define ATTRIBUTE_COLD
 #endif
 
 typedef enum {