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

Jamey Sharp jamey at minilop.net
Wed Dec 21 14:01:09 PST 2011


I sure don't see any reason not to merge that.

Reviewed-by: Jamey Sharp <jamey at minilop.net>

On Tue, Dec 20, 2011 at 07:49:47PM -0800, 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>
> ---
>  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"
> -- 
> 1.7.7.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111221/82c9b470/attachment.pgp>


More information about the xorg-devel mailing list