From: Vlad Golovkin <vlad.golovkin.mail@gmail.com>
Date: Tue, 6 Feb 2018 13:48:00 +0000 (-0700)
Subject: util: remove redundant check for the __clang__ macro
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d919ff0f279b6007809220dc43af26fc25435356;p=mesa.git

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@vmware.com>
---

diff --git a/src/util/macros.h b/src/util/macros.h
index 432d5139301..e3c785af508 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