diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-30 19:58:03 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-30 19:58:03 +1000 |
| commit | 03c60e0fb691d39a168a8825ace7150ef3a20e02 (patch) | |
| tree | e7433c539a7584d29d4a6bf23aacdc348167aed8 /src/mesa/state_tracker/st_texture.c | |
| parent | 68395f6726183a0776e324b900e429449ede2b22 (diff) | |
| parent | a52c0416d1f2105960b4646e2e268aed26814689 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index cbc6f84998..8e3235cc99 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -30,6 +30,8 @@ #include "st_texture.h" #include "enums.h" +#undef Elements /* fix re-defined macro warning */ + #include "pipe/p_state.h" #include "pipe/p_context.h" #include "pipe/p_defines.h" |