xserver: Branch 'master'

[Peter Hutterer]

Kristian Høgsberg wrote:
> > diff-tree 2243b30e54df07892f75e3d65b687abe5b183cf3 (from ff4bd3addb48df3eacc4b121cc249a7f38eb981a)

[...]

> +    __GLXDRIdrawable *drawable =
> +	    containerOf(driDraw, __GLXDRIdrawable, driDrawable);


glxdri.c: In function '__glXReportDamage':
glxdri.c:952: warning: implicit declaration of function 'containerOf'
glxdri.c:952: warning: nested extern declaration of 'containerOf'
glxdri.c:952: error: expected expression before '__GLXDRIdrawable'
glxdri.c:952: warning: initialization makes pointer from integer without 
a cast
glxdri.c: At top level:
glxdri.c:982: warning: initialization from incompatible pointer type
make[1]: *** [glxdri.lo] Error 1
make[1]: Leaving directory `/home/whot/master/xserver/GL/glx'
make: *** [all-recursive] Error 1


mesa and pixman, the usual suspects, are fresh from git. anything else 
I'm missing?

Cheers,
   Peter