diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-23 07:03:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-23 07:03:58 +0000 |
| commit | 345335d61c71c245846d679d568a8b5eca1a5ca9 (patch) | |
| tree | 7b878ae84134fa091dd2bdc2695251e609209ebe /xorg-server/include | |
| parent | fbbbbe88405440920f4baa5a3107ec0b9a6f8cb7 (diff) | |
| parent | c356d5298f18cd103ef7caad015d98d2022044ac (diff) | |
| download | vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.gz vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.bz2 vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/list.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/include/list.h b/xorg-server/include/list.h index 3a07a0b77..9479d2d92 100644 --- a/xorg-server/include/list.h +++ b/xorg-server/include/list.h @@ -94,10 +94,10 @@ list_is_empty(struct list *head) &pos->member != (head); \
pos = __container_of(pos->member.next, pos, member))
-#define list_for_each_entry_safe(pos, next, head, member) \
+#define list_for_each_entry_safe(pos, tmp, head, member) \
for (pos = __container_of((head)->next, pos, member), \
- next = __container_of(pos->member.next, pos, member); \
+ tmp = __container_of(pos->member.next, pos, member); \
&pos->member != (head); \
- pos = next, next = __container_of(next->member.next, next, member))
+ pos = tmp, tmp = __container_of(pos->member.next, tmp, member))
#endif
|