Mesa (master): anv: use do { } while (0) in the anv_finishme macro

Emil Velikov evelikov at kemper.freedesktop.org
Mon Nov 28 19:13:16 UTC 2016


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

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Nov 24 18:18:13 2016 +0000

anv: use do { } while (0) in the anv_finishme macro

Use the generic construct instead of the currect GCC specific one.

Suggested-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/intel/vulkan/anv_private.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 2fc543d..edc008d 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -207,13 +207,14 @@ void anv_loge_v(const char *format, va_list va);
 /**
  * Print a FINISHME message, including its source location.
  */
-#define anv_finishme(format, ...) ({ \
-   static bool reported = false; \
-   if (!reported) { \
-      __anv_finishme(__FILE__, __LINE__, format, ##__VA_ARGS__); \
-      reported = true; \
-   } \
-})
+#define anv_finishme(format, ...) \
+   do { \
+      static bool reported = false; \
+      if (!reported) { \
+         __anv_finishme(__FILE__, __LINE__, format, ##__VA_ARGS__); \
+         reported = true; \
+      } \
+   } while (0)
 
 /* A non-fatal assert.  Useful for debugging. */
 #ifdef DEBUG




More information about the mesa-commit mailing list