[PATCH weston 2/2] Fix build warnings from image_loader

[Kristian Høgsberg]

On Fri, Nov 30, 2012 at 01:37:28PM +0200, Pekka Paalanen wrote:
> Fix the following build warnings, and the build failures due to the
> warning fixes:
> 
>   CC     libshared_cairo_la-image-loader.lo
> image-loader.c:369:1: warning: no previous prototype for 'load_image'
> 
>   CC     x11_backend_la-compositor-x11.lo
> compositor-x11.c: In function 'x11_output_set_icon':
> compositor-x11.c:396:2: warning: implicit declaration of function 'load_image'
> compositor-x11.c:396:8: warning: assignment makes pointer from integer without a cast
> 
>   CC     wayland_backend_la-compositor-wayland.lo
> compositor-wayland.c: In function 'create_border':
> compositor-wayland.c:97:2: warning: implicit declaration of function 'load_image'
> compositor-wayland.c:97:8: warning: assignment makes pointer from integer without a cast

Oops, yes, sorry about that.
Kristian

> Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
> ---
>  shared/cairo-util.h      |    1 +
>  shared/image-loader.c    |    2 +-
>  src/Makefile.am          |    4 ++++
>  src/compositor-wayland.c |    1 +
>  src/compositor-x11.c     |    1 +
>  src/xwayland/Makefile.am |    6 +++++-
>  6 files changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/shared/cairo-util.h b/shared/cairo-util.h
> index 64ed03f..3b93d40 100644
> --- a/shared/cairo-util.h
> +++ b/shared/cairo-util.h
> @@ -23,6 +23,7 @@
>  #ifndef _CAIRO_UTIL_H
>  #define _CAIRO_UTIL_H
>  
> +#include <cairo.h>
>  #include <pixman.h>
>  
>  void
> diff --git a/shared/image-loader.c b/shared/image-loader.c
> index 1960bb5..64ba2ae 100644
> --- a/shared/image-loader.c
> +++ b/shared/image-loader.c
> @@ -29,7 +29,7 @@
>  #include <png.h>
>  #include <pixman.h>
>  
> -#include "config-parser.h"
> +#include "cairo-util.h"
>  
>  #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
>  
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 0d24084..e8315ca 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -96,6 +96,8 @@ x11_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(X11_COMPOSITOR_LIBS) \
>  	../shared/libshared-cairo.la
>  x11_backend_la_CFLAGS =				\
>  	$(COMPOSITOR_CFLAGS)			\
> +	$(PIXMAN_CFLAGS)			\
> +	$(CAIRO_CFLAGS)				\
>  	$(X11_COMPOSITOR_CFLAGS)		\
>  	$(GCC_CFLAGS)
>  x11_backend_la_SOURCES = compositor-x11.c
> @@ -129,6 +131,8 @@ wayland_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(WAYLAND_COMPOSITOR_LIBS) \
>  	../shared/libshared-cairo.la
>  wayland_backend_la_CFLAGS =			\
>  	$(COMPOSITOR_CFLAGS)			\
> +	$(PIXMAN_CFLAGS)			\
> +	$(CAIRO_CFLAGS)				\
>  	$(WAYLAND_COMPOSITOR_CFLAGS)		\
>  	$(GCC_CFLAGS)
>  wayland_backend_la_SOURCES = compositor-wayland.c
> diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
> index 24dccd1..167fce6 100644
> --- a/src/compositor-wayland.c
> +++ b/src/compositor-wayland.c
> @@ -38,6 +38,7 @@
>  
>  #include "compositor.h"
>  #include "gl-renderer.h"
> +#include "../shared/cairo-util.h"
>  
>  struct wayland_compositor {
>  	struct weston_compositor	 base;
> diff --git a/src/compositor-x11.c b/src/compositor-x11.c
> index b26da09..04a1803 100644
> --- a/src/compositor-x11.c
> +++ b/src/compositor-x11.c
> @@ -48,6 +48,7 @@
>  #include "compositor.h"
>  #include "gl-renderer.h"
>  #include "../shared/config-parser.h"
> +#include "../shared/cairo-util.h"
>  
>  #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)
>  
> diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am
> index 1c3b114..8f3bddd 100644
> --- a/src/xwayland/Makefile.am
> +++ b/src/xwayland/Makefile.am
> @@ -12,7 +12,11 @@ xwayland_la_LDFLAGS = -module -avoid-version
>  xwayland_la_LIBADD =			\
>  	$(XWAYLAND_LIBS)		\
>  	$(top_builddir)/shared/libshared-cairo.la
> -xwayland_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
> +xwayland_la_CFLAGS =				\
> +	$(GCC_CFLAGS)				\
> +	$(COMPOSITOR_CFLAGS)			\
> +	$(PIXMAN_CFLAGS)			\
> +	$(CAIRO_CFLAGS)
>  xwayland_la_SOURCES =				\
>  	xwayland.h				\
>  	window-manager.c			\
> -- 
> 1.7.8.6
>