summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2012-10-10 11:40:07 +0100
committerJosé Fonseca <[email protected]>2012-10-10 11:40:34 +0100
commit3f228ed0907f1eff46e1afa3fe3ac961c532bc5f (patch)
tree0cd40982241df1b30b5fb37ca78fa9552a336288
parenta5558881519dc424abc25926d5a44ddfff06a993 (diff)
mesa: Prevent CONST macro re-definition.
Should fix MSVC build, as windows.h also defines CONST. CONST usage in get.c is not new, so probably this just appeared now due to changes in the includes.
-rw-r--r--src/mesa/main/get.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index b943d69b71b..7570fab962c 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -172,6 +172,7 @@ union value {
LOC_CONTEXT, type, offsetof(struct gl_context, field)
#define ARRAY_FIELD(field, type) \
LOC_ARRAY, type, offsetof(struct gl_array_object, field)
+#undef CONST /* already defined through windows.h */
#define CONST(value) \
LOC_CONTEXT, TYPE_CONST, value