xserver: Branch 'master'

[Keith Packard]

 hw/xquartz/GL/indirect.c |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit a97252db24669a3e26a935024ea38b8a28d30586
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Dec 20 19:49:47 2011 -0800

    XQuartz: GL: Buildfix for recent GLX changes
    
    dispatch.h was leftover from an earlier implementation and is no longer
    needed, so remove it since including it causes a build failure due to
    conflicts between GL/gl.h and OpenGL/gl.h
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 27d6dae..e6ff376 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -48,9 +48,6 @@
 #include <glxserver.h>
 #include <glxutil.h>
 
-typedef unsigned long long GLuint64EXT;
-typedef long long GLint64EXT;
-#include <dispatch.h>
 #include <glapi.h>
 
 #include "x-hash.h"