From 7c609c911a3a33b7e4ddad46b8fc42878a073ee7 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Wed, 15 Apr 2015 21:29:07 +1000 Subject: [PATCH] glamor: remove const from the return type of glamor_get_drawable_location() 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 Reviewed-by: Kenneth Graunke Signed-off-by: Keith Packard --- 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 55174541f..965024e68 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 898a9348a..4b9ba4d55 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);