summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorStéphane Marchesin <[email protected]>2011-06-23 20:53:47 -0700
committerStéphane Marchesin <[email protected]>2011-06-23 20:58:05 -0700
commit5f691ba36fc52da3f0565c238c1f892422f7d439 (patch)
tree1b136036e0f0593f3369c75308c24b2db7fcc5f1 /src/mesa
parentad7387fe12c034d32da4bf4e078d494cbaca5288 (diff)
dri/r200: rename __atom to current_atom.
__atom is defined by gcc when the atom compile optimizations are used.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r200/r200_cmdbuf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
index 931a9ecf8fe..db5cc160f66 100644
--- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c
+++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
@@ -47,9 +47,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#define insert_at_tail_if(atom_list, atom) \
do { \
- struct radeon_state_atom* __atom = (atom); \
- if (__atom->check) \
- insert_at_tail((atom_list), __atom); \
+ struct radeon_state_atom* current_atom = (atom); \
+ if (current__atom->check) \
+ insert_at_tail((atom_list), current_atom); \
} while(0)
void r200SetUpAtomList( r200ContextPtr rmesa )