[cairo] [PATCH] glx: Use GLX_NONE in place of None

[Bryce W. Harrington]

On Mon, May 19, 2014 at 12:04:33PM +0530, Ravi Nanjundappa wrote:
> Thank you Bryce for merging the patch. :) 
> 
> There is a similar patch (but for cairo-boilerplate-vg.c) and is been
> uploaded against https://bugs.freedesktop.org/show_bug.cgi?id=55805
> Could you please have a look at the patch and merge the same, if the changes
> are ok ?

Looks good; I've pushed it to trunk.
 
Thanks,
Bryce

> Thanks and Best Regards, 
> N Ravi
> 
> > -----Original Message-----
> > From: Bryce W. Harrington [mailto:b.harrington at samsung.com]
> > Sent: Saturday, May 17, 2014 12:26 AM
> > To: Ravi Nanjundappa
> > Cc: cairo at cairographics.org
> > Subject: Re: [cairo] [PATCH] glx: Use GLX_NONE in place of None
> > 
> > On Thu, May 15, 2014 at 04:06:06PM +0530, Ravi Nanjundappa wrote:
> > > I executed the 'make' with the changes. The basic build test is
> > > working fine.
> > > Also I ran the gl related tests with and without the changes. The
> > > results are same in both the scenarios.
> > > Help me in reviewing this patch (along with the one submitted for
> > > https://bugs.freedesktop.org/show_bug.cgi?id=55805).
> > 
> > Thanks, looks good.
> > Applied and pushed.
> > 
> > Bryce
> > 
> > > Thanks and Best Regards,
> > > N Ravi
> > >
> > > > -----Original Message-----
> > > > From: Ravi Nanjundappa [mailto:nravi.n at samsung.com]
> > > > Sent: Thursday, May 15, 2014 4:00 PM
> > > > To: cairo at cairographics.org
> > > > Cc: Ravi Nanjundappa
> > > > Subject: [PATCH] glx: Use GLX_NONE in place of None
> > > >
> > > > Use "GLX_NONE" in rgb and rgba attributes instead of "None" in
> > > > cairo- boilerplate-glx.c
> > > >
> > > > Signed-off-by: Ravi Nanjundappa <nravi.n at samsung.com>
> > > > ---
> > > >  boilerplate/cairo-boilerplate-glx.c |   10 +++++-----
> > > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > > >
> > > > diff --git a/boilerplate/cairo-boilerplate-glx.c
> > > b/boilerplate/cairo-boilerplate-
> > > > glx.c
> > > > index 0643644..3d58215 100644
> > > > --- a/boilerplate/cairo-boilerplate-glx.c
> > > > +++ b/boilerplate/cairo-boilerplate-glx.c
> > > > @@ -82,13 +82,13 @@ _cairo_boilerplate_gl_create_surface (const char
> > > > 		*name,
> > > >  			   GLX_BLUE_SIZE, 1,
> > > >  			   GLX_ALPHA_SIZE, 1,
> > > >  			   GLX_DOUBLEBUFFER,
> > > > -			   None };
> > > > +			   GLX_NONE };
> > > >      int rgb_attribs[] = { GLX_RGBA,
> > > >  			  GLX_RED_SIZE, 1,
> > > >  			  GLX_GREEN_SIZE, 1,
> > > >  			  GLX_BLUE_SIZE, 1,
> > > >  			  GLX_DOUBLEBUFFER,
> > > > -			  None };
> > > > +			  GLX_NONE };
> > > >      XVisualInfo *visinfo;
> > > >      GLXContext ctx;
> > > >      gl_target_closure_t *gltc;
> > > > @@ -236,7 +236,7 @@ _cairo_boilerplate_gl_create_window (const char
> > > > 		       *name,
> > > >  			   GLX_BLUE_SIZE, 1,
> > > >  			   GLX_ALPHA_SIZE, 1,
> > > >  			   GLX_DOUBLEBUFFER,
> > > > -			   None };
> > > > +			   GLX_NONE };
> > > >
> > > >      gltc = calloc (1, sizeof (gl_target_closure_t));
> > > >      *closure = gltc;
> > > > @@ -268,7 +268,7 @@ _cairo_boilerplate_gl_create_window_msaa
> > (const
> > > > char		       *name,
> > > >  			   GLX_SAMPLES, 4,
> > > >  			   GLX_SAMPLE_BUFFERS, 1,
> > > >  			   GLX_DOUBLEBUFFER,
> > > > -			   None };
> > > > +			   GLX_NONE };
> > > >
> > > >      gltc = calloc (1, sizeof (gl_target_closure_t));
> > > >      *closure = gltc;
> > > > @@ -299,7 +299,7 @@ _cairo_boilerplate_gl_create_window_db (const
> > char
> > > > 		  *name,
> > > >  			   GLX_BLUE_SIZE, 1,
> > > >  			   GLX_ALPHA_SIZE, 1,
> > > >  			   GLX_DOUBLEBUFFER,
> > > > -			   None };
> > > > +			   GLX_NONE };
> > > >
> > > >      gltc = calloc (1, sizeof (gl_target_closure_t));
> > > >      *closure = gltc;
> > > > --
> > > > 1.7.9.5
> > >
> > > --
> > > cairo mailing list
> > > cairo at cairographics.org
> > > http://lists.cairographics.org/mailman/listinfo/cairo=