summaryrefslogtreecommitdiff
path: root/shared/image-loader.c
diff options
context:
space:
mode:
authorPekka Paalanen <ppaalanen@gmail.com>2012-11-30 13:37:28 +0200
committerKristian Høgsberg <krh@bitplanet.net>2012-11-30 15:03:47 -0500
commit6e09a298b703cc7e5da2b0933f5b772f374e5893 (patch)
tree6223063bc7d6b3c7ff04d1ee3c547c4b5fd7c2eb /shared/image-loader.c
parentaeb10f85220fb6e50cace2cfdd48c94b28a4b92a (diff)
downloadweston-6e09a298b703cc7e5da2b0933f5b772f374e5893.tar.gz
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
Diffstat (limited to 'shared/image-loader.c')
-rw-r--r--shared/image-loader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared/image-loader.c b/shared/image-loader.c
index 1960bb50..64ba2aea 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])