mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-09-06 18:05:39 +00:00
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>
This commit is contained in:
parent
0396ba204d
commit
4fbb65372e
|
@ -23,6 +23,7 @@
|
|||
#ifndef _CAIRO_UTIL_H
|
||||
#define _CAIRO_UTIL_H
|
||||
|
||||
#include <cairo.h>
|
||||
#include <pixman.h>
|
||||
|
||||
void
|
||||
|
|
|
@ -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])
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
|
||||
#include "compositor.h"
|
||||
#include "gl-renderer.h"
|
||||
#include "../shared/cairo-util.h"
|
||||
|
||||
struct wayland_compositor {
|
||||
struct weston_compositor base;
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue