summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2009-06-11 10:52:37 +0100
committerKeith Whitwell <[email protected]>2009-06-18 09:53:45 +0100
commit0491142152dcc61ebe0b46b05c94957e54c44bd9 (patch)
tree3966650f0502a9b1a497183aa4f24eebce8baa03 /src/mesa
parent39366ed995310c95d95e0c7a33fb0bec637a00b6 (diff)
mesa: protect Elements against multiple definitions
Mesa and gallium both have a definition of this macro
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/compiler.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 93103fe878d..e79bbc2ac5f 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