[PATCH GL 1/1] XQuartz: GL: Buildfix for recent GLX changes

Ian Romanick idr at freedesktop.org
Fri Dec 23 15:38:57 PST 2011


On 12/20/2011 07:49 PM, Jeremy Huddleston wrote:
> 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: Ian Romanick <ian.d.romanick at intel.com>

I'll be sure to CC you next time I make significant GLX changes.  Sorry.

> ---
>   hw/xquartz/GL/indirect.c |    3 ---
>   1 files changed, 0 insertions(+), 3 deletions(-)
>
> 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"



More information about the xorg-devel mailing list