[PATCH] glamor: remove const from the return type of glamor_get_drawable_location()

Kenneth Graunke kenneth at whitecape.org
Tue Apr 21 23:57:21 PDT 2015


On Wednesday, April 15, 2015 09:29:07 PM Jonathan Gray wrote:
> Fixes a build error with gcc 4.2.1 on OpenBSD due to
> -Werror=return-type from xorg-macros.
> 
> error: type qualifiers ignored on function return type
> 
> Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
> ---
>  glamor/glamor_core.c | 2 +-
>  glamor/glamor_priv.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
> index 5517454..965024e 100644
> --- a/glamor/glamor_core.c
> +++ b/glamor/glamor_core.c
> @@ -35,7 +35,7 @@
>  
>  #include "glamor_priv.h"
>  
> -const Bool
> +Bool
>  glamor_get_drawable_location(const DrawablePtr drawable)
>  {
>      PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
> diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
> index 898a934..4b9ba4d 100644
> --- a/glamor/glamor_priv.h
> +++ b/glamor/glamor_priv.h
> @@ -676,7 +676,7 @@ glamor_pixmap_fbo *glamor_create_fbo_array(glamor_screen_private *glamor_priv,
>  void glamor_init_finish_access_shaders(ScreenPtr screen);
>  void glamor_fini_finish_access_shaders(ScreenPtr screen);
>  
> -const Bool glamor_get_drawable_location(const DrawablePtr drawable);
> +Bool glamor_get_drawable_location(const DrawablePtr drawable);
>  void glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap,
>                                  int *x, int *y);
>  GLint glamor_compile_glsl_prog(GLenum type, const char *source);
> 

Indeed, returning const Bool is just silly :)

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.x.org/archives/xorg-devel/attachments/20150421/be04203f/attachment.sig>


More information about the xorg-devel mailing list