Mesa (mesa_7_5_branch): mesa: protect Elements against multiple definitions
Keith Whitwell
keithw at kemper.freedesktop.org
Thu Jun 18 09:15:09 UTC 2009
Module: Mesa
Branch: mesa_7_5_branch
Commit: 0491142152dcc61ebe0b46b05c94957e54c44bd9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0491142152dcc61ebe0b46b05c94957e54c44bd9
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Jun 11 10:52:37 2009 +0100
mesa: protect Elements against multiple definitions
Mesa and gallium both have a definition of this macro
---
src/mesa/main/compiler.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 93103fe..e79bbc2 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -468,9 +468,9 @@ do { \
#endif
-
+#ifndef Elements
#define Elements(x) (sizeof(x)/sizeof(*(x)))
-
+#endif
More information about the mesa-commit
mailing list