Fix build warnings from image_loader
authorPekka Paalanen <ppaalanen@gmail.com>
Fri, 30 Nov 2012 11:37:28 +0000 (13:37 +0200)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 30 Nov 2012 20:03:47 +0000 (15:03 -0500)
commit6e09a298b703cc7e5da2b0933f5b772f374e5893
tree6223063bc7d6b3c7ff04d1ee3c547c4b5fd7c2eb
parentaeb10f85220fb6e50cace2cfdd48c94b28a4b92a
Fix build warnings from image_loader

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

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Conflicts:
src/compositor-wayland.c
shared/cairo-util.h
shared/image-loader.c
src/Makefile.am
src/compositor-wayland.c
src/compositor-x11.c
src/xwayland/Makefile.am