diff options
| author | Brian Paul <[email protected]> | 2008-11-05 15:58:09 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-11-05 15:58:09 -0700 |
| commit | 80a718a63bf2fa817e346f0f5731ee9ef2e0e68b (patch) | |
| tree | 4a1bdb03ae8b8482b9a15e56c9604fcc34e95b0e /src/gallium/include | |
| parent | 7115b79b77e541f3eb81db00f6f0c34a0f224feb (diff) | |
| parent | de14fdd63f26a2e6fc55fad92c08966f269601a6 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/rtasm/rtasm_execmem.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_log.c
src/mesa/state_tracker/st_atom_framebuffer.c
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_debug.h b/src/gallium/include/pipe/p_debug.h index cb6196aa9fb..3b00fb9aa89 100644 --- a/src/gallium/include/pipe/p_debug.h +++ b/src/gallium/include/pipe/p_debug.h @@ -49,7 +49,7 @@ extern "C" { #endif -#ifdef DBG +#if defined(DBG) || defined(DEBUG) #ifndef DEBUG #define DEBUG 1 #endif |