Mesa (master): mesa: Prevent CONST macro re-definition.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Wed Oct 10 10:41:50 UTC 2012


Module: Mesa
Branch: master
Commit: 3f228ed0907f1eff46e1afa3fe3ac961c532bc5f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f228ed0907f1eff46e1afa3fe3ac961c532bc5f

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Oct 10 11:40:07 2012 +0100

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 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index b943d69..7570fab 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
 




More information about the mesa-commit mailing list