From 7221f52389f788f95ccf5816e2370b5a1acef7f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sun, 11 Mar 2012 10:47:21 +0000 Subject: [PATCH] mesa: Prevent collision of ERROR define on Windows. This issue might recur on other OSes. If so then it might be better to remove the C-preprocessor magic, and use fully qualified defines instead. Signed-off-by: Dave Airlie --- src/mesa/main/errors.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 611c77d1ca6..22561003a6f 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -55,6 +55,9 @@ static char out_of_memory[] = "Debugging error: out of memory"; #define source_is(s, kind) enum_is(s, SOURCE, kind) #define type_is(t, kind) enum_is(t, TYPE, kind) +/* Prevent define collision on Windows */ +#undef ERROR + enum { SOURCE_APPLICATION, SOURCE_THIRD_PARTY, -- 2.30.2