Just a fast comment to point here that mesa git also has problems compiling because of the changes made here.
Just a fast comment to point here that mesa git also has problems compiling because of the changes made here.