fontconfig mesa pixman xserver git update 4 July 2014

xserver          commit a61ca6f006d70343c88fe45206fae0669d1e8971
pixman           commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5
fontconfig       commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7
mesa             commit 9a37eb8adb6558a4abf47774b583cb582a0ae116

1 files changed, 3 insertions, 8 deletions

diff --git a/mesalib/src/glsl/opt_cse.cpp b/mesalib/src/glsl/opt_cse.cpp
index 1b8782bcb..0e720cc26 100644
--- a/mesalib/src/glsl/opt_cse.cpp
+++ b/mesalib/src/glsl/opt_cse.cpp
@@ -173,9 +173,7 @@ dump_ae(exec_list *ae)
    int i = 0;
 
    printf("CSE: AE contents:\n");
-   foreach_list(node, ae) {
-      ae_entry *entry = (ae_entry *)node;
-
+   foreach_in_list(ae_entry, entry, ae) {
       printf("CSE:   AE %2d (%p): ", i, entry);
       (*entry->val)->print();
       printf("\n");
@@ -254,9 +252,7 @@ is_cse_candidate(ir_rvalue *ir)
 ir_rvalue *
 cse_visitor::try_cse(ir_rvalue *rvalue)
 {
-   foreach_list(node, ae) {
-      ae_entry *entry = (ae_entry *)node;
-
+   foreach_in_list(ae_entry, entry, ae) {
       if (debug) {
          printf("Comparing to AE %p: ", entry);
          (*entry->val)->print();
@@ -303,8 +299,7 @@ cse_visitor::try_cse(ir_rvalue *rvalue)
           * updated so that any further elimination from inside gets its new
           * assignments put before our new assignment.
           */
-         foreach_list(fixup_node, ae) {
-            ae_entry *fixup_entry = (ae_entry *)fixup_node;
+         foreach_in_list(ae_entry, fixup_entry, ae) {
             if (contains_rvalue(assignment->rhs, *fixup_entry->val))
                fixup_entry->base_ir = assignment;
          }