From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 18 Sep 2019 16:29:30 +0000 (+0100)
Subject: utils/macros.h: Sprinkle `__...__' over GCC (and Clang) attribute names.
X-Git-Tag: 2.4.0~2
X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/commitdiff_plain/2eea69731acfd2491d67e84edaa078f24c48c96b

utils/macros.h: Sprinkle `__...__' over GCC (and Clang) attribute names.

I suspect that things like `noreturn' might already be macros.  Though,
honestly, this header file is not a shining example of namespace hygiene
in countless other ways.
---

diff --git a/utils/macros.h b/utils/macros.h
index 181f2f7..5f432f7 100644
--- a/utils/macros.h
+++ b/utils/macros.h
@@ -53,20 +53,20 @@
 /* --- Compiler-specific definitions --- */
 
 #if GCC_VERSION_P(2, 5) || CLANG_VERSION_P(3, 3)
-#  define NORETURN __attribute__((noreturn))
-#  define PRINTF_LIKE(fix, aix) __attribute__((format(printf, fix, aix)))
-#  define SCANF_LIKE(fix, aix) __attribute__((format(scanf, fix, aix)))
-#  define IGNORABLE __attribute__((unused))
+#  define NORETURN __attribute__((__noreturn__))
+#  define PRINTF_LIKE(fix, aix) __attribute__((__format__(printf, fix, aix)))
+#  define SCANF_LIKE(fix, aix) __attribute__((__format__(scanf, fix, aix)))
+#  define IGNORABLE __attribute__((__unused__))
 #endif
 
 #if GCC_VERSION_P(4, 5) || CLANG_VERSION_P(3, 3)
-#  define DEPRECATED(msg) __attribute__((deprecated(msg)))
+#  define DEPRECATED(msg) __attribute__((__deprecated__(msg)))
 #elif GCC_VERSION_P(3, 1)
-#  define DEPRECATED(msg) __attribute__((deprecated))
+#  define DEPRECATED(msg) __attribute__((__deprecated__))
 #endif
 
 #if GCC_VERSION_P(4, 0) || CLANG_VERSION_P(3, 3)
-#  define EXECL_LIKE(ntrail) __attribute__((sentinel(ntrail)))
+#  define EXECL_LIKE(ntrail) __attribute__((__sentinel__(ntrail)))
 #endif
 
 #if CLANG_VERSION_P(3, 3)