aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/s3v/s3v_macros.h
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2008-06-24 14:08:08 -0700
committerEric Anholt <[email protected]>2008-06-24 14:08:08 -0700
commitf6abe8f0f2fba3073b58b96ed38aae163c765b4a (patch)
tree706ba29d021fb1e4c54500e8773e3dda5f9ff6e8 /src/mesa/drivers/dri/s3v/s3v_macros.h
parenta42dac187973cbc17be6c59db89264cbc935ab91 (diff)
parent5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea (diff)
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/s3v/s3v_macros.h')
-rw-r--r--src/mesa/drivers/dri/s3v/s3v_macros.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_macros.h b/src/mesa/drivers/dri/s3v/s3v_macros.h
index 3bc871b7eaf..7e9b4529df4 100644
--- a/src/mesa/drivers/dri/s3v/s3v_macros.h
+++ b/src/mesa/drivers/dri/s3v/s3v_macros.h
@@ -19,6 +19,7 @@
#include <stdio.h>
#endif
+#undef DEBUG
#if GENERIC_DEBUG
#define DEBUG(str) printf str
#else