[cairo] including X headers in glitz-glx.h

David Reveman davidr at novell.com
Sun Feb 20 14:04:15 PST 2005


On Sun, 2005-02-20 at 14:19 +1100, Dave Airlie wrote:
> I'm messing with Xgl on mesa-solo (don't expect any major results from
> me.. I'm just messing about...) but I've hit an issue where
> glitz-glx.h inclues X header files... when it really should be
> including GL/glx.h

Applications that use glitz's GLX backend shouldn't have to know
anything about GLX. Xlib should be enough. Hmm, I don't think Xutil.h
needs to be included, don't know why I put it there. 'Window' and
'Display' are the only types the application is forced to know about,

> 
> I don't think it should cause any issue.. patch follows, not sure if
> gmail mangles patches though but its simple enough....
> 
> Dave.
> 
> Index: src/glx/glitz-glx.h
> ===================================================================
> RCS file: /cvs/cairo/glitz/src/glx/glitz-glx.h,v
> retrieving revision 1.2
> diff -u -r1.2 glitz-glx.h
> --- src/glx/glitz-glx.h 25 Jan 2005 19:50:26 -0000      1.2
> +++ src/glx/glitz-glx.h 20 Feb 2005 03:11:15 -0000
> @@ -32,8 +32,7 @@
>  extern "C" {
>  #endif
>   
> -#include <X11/Xlib.h>
> -#include <X11/Xutil.h>
> +#include <GL/glx.h>
>   
>  /* glitz_glx_info.c */

-David




More information about the cairo mailing list