diff options
| author | José Fonseca <jose.r.fonseca@gmail.com> | 2012-03-11 10:47:21 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-11 16:50:29 +0000 |
| commit | 7221f52389f788f95ccf5816e2370b5a1acef7f7 (patch) | |
| tree | c65e1ab0342ea48c2f227c2d9c1c3f86379ad81e | |
| parent | fa476782fde96c93c0904bbab3bc4dd44aef8712 (diff) | |
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 <airlied@redhat.com>
| -rw-r--r-- | src/mesa/main/errors.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 611c77d1ca..22561003a6 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, |