diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-13 20:22:46 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-13 20:22:46 -0700 |
| commit | 443a7e4e9a360acbc3e662c098be436f180bf81d (patch) | |
| tree | 71125fc394bdcbc17cd7ed74c592b9a7761541f8 /src/mesa/state_tracker/st_texture.c | |
| parent | 2f8ee757ab324d599fcb8287789eb5f1a7890d74 (diff) | |
| parent | 27041d7cb3faeaed483538a228573466363ec1c7 (diff) | |
Merge branch 'master' into glsl2
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index dbdf1ea1ad..add6e949df 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -25,14 +25,14 @@ * **************************************************************************/ +#include <stdio.h> + #include "st_context.h" #include "st_format.h" #include "st_texture.h" #include "st_cb_fbo.h" #include "main/enums.h" -#undef Elements /* fix re-defined macro warning */ - #include "pipe/p_state.h" #include "pipe/p_context.h" #include "pipe/p_defines.h" |