projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 39366ed)
mesa: protect Elements against multiple definitions
authorKeith Whitwell <keithw@vmware.com>
Thu, 11 Jun 2009 09:52:37 +0000 (10:52 +0100)
committerKeith Whitwell <keithw@vmware.com>
Thu, 18 Jun 2009 08:53:45 +0000 (09:53 +0100)
Mesa and gallium both have a definition of this macro

src/mesa/main/compiler.h patch | blob | history

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 93103fe878dc68074db2751e9ee579eb5de9eeab..e79bbc2ac5f780ded3200d62f942b11bc9839888 100644 (file)
--- 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