diff options
| author | Brian Paul <[email protected]> | 2009-06-16 18:25:52 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-06-16 18:25:52 -0600 |
| commit | 8d482227915552c414e13743652e6794c4313ae2 (patch) | |
| tree | 27bb35b40ec242836320180370d7fd5fa3820f41 /src/gallium/include/pipe/p_thread.h | |
| parent | 4ef1f8e3b52a06fcf58f78c9c36738531b91dbac (diff) | |
| parent | 6b917d0b1787280f976c2f0d1ead0e5d7587a3e9 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/api_validate.c
Diffstat (limited to 'src/gallium/include/pipe/p_thread.h')
| -rw-r--r-- | src/gallium/include/pipe/p_thread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_thread.h b/src/gallium/include/pipe/p_thread.h index df6d38904a6..96e8e087447 100644 --- a/src/gallium/include/pipe/p_thread.h +++ b/src/gallium/include/pipe/p_thread.h @@ -36,6 +36,7 @@ #include "pipe/p_compiler.h" +#include "util/u_debug.h" /* for assert */ #if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) |