diff options
| author | Pekka Paalanen <ppaalanen@gmail.com> | 2012-11-30 13:37:28 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-11-30 15:03:47 -0500 |
| commit | 6e09a298b703cc7e5da2b0933f5b772f374e5893 (patch) | |
| tree | 6223063bc7d6b3c7ff04d1ee3c547c4b5fd7c2eb | |
| parent | aeb10f85220fb6e50cace2cfdd48c94b28a4b92a (diff) | |
| download | weston-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
| -rw-r--r-- | shared/cairo-util.h | 1 | ||||
| -rw-r--r-- | shared/image-loader.c | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/compositor-wayland.c | 1 | ||||
| -rw-r--r-- | src/compositor-x11.c | 1 | ||||
| -rw-r--r-- | 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 64ed03fe..3b93d40d 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 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]) diff --git a/src/Makefile.am b/src/Makefile.am index 7f127b89..4be2e11e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -87,6 +87,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 @@ -120,6 +122,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 d42d56f1..c675e83e 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -42,6 +42,7 @@ #include <EGL/eglext.h> #include "compositor.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 20aede81..a5462630 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -50,6 +50,7 @@ #include "compositor.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 1c3b114b..8f3bddd2 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 \ |