projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a555888
)
mesa: Prevent CONST macro re-definition.
author
José Fonseca
<jfonseca@vmware.com>
Wed, 10 Oct 2012 10:40:07 +0000
(11:40 +0100)
committer
José Fonseca
<jfonseca@vmware.com>
Wed, 10 Oct 2012 10:40:34 +0000
(11:40 +0100)
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
patch
|
blob
|
history
diff --git
a/src/mesa/main/get.c
b/src/mesa/main/get.c
index b943d69b71bb8a625cc5b0a3b9daa1a96e6ce9e0..7570fab962c54ecb49c5b5a51f4879fc6f04a7ae 100644
(file)
--- 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