Mesa (master): util: remove redundant check for the __clang__ macro

Brian Paul brianp at kemper.freedesktop.org
Tue Feb 6 22:26:51 UTC 2018


Module: Mesa
Branch: master
Commit: d919ff0f279b6007809220dc43af26fc25435356
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d919ff0f279b6007809220dc43af26fc25435356

Author: Vlad Golovkin <vlad.golovkin.mail at gmail.com>
Date:   Tue Feb  6 06:48:00 2018 -0700

util: remove redundant check for the __clang__ macro

Clang defines __GNUC__ macro, so one doesn't need to check __clang__
macro in this particular case.

v2: added comment as per Brian Paul's suggestion

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/util/macros.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util/macros.h b/src/util/macros.h
index 432d513930..e3c785af50 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -137,8 +137,9 @@ do {                       \
 #endif
 
 /* Forced function inlining */
+/* Note: Clang also sets __GNUC__ (see other cases below) */
 #ifndef ALWAYS_INLINE
-#  if defined(__GNUC__) || defined(__clang__)
+#  if defined(__GNUC__)
 #    define ALWAYS_INLINE inline __attribute__((always_inline))
 #  elif defined(_MSC_VER)
 #    define ALWAYS_INLINE __forceinline




More information about the mesa-commit mailing list