From 3f228ed0907f1eff46e1afa3fe3ac961c532bc5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 10 Oct 2012 11:40:07 +0100 Subject: [PATCH] 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. --- src/mesa/main/get.c | 1 + 1 file changed, 1 insertion(+) 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 -- 2.30.2