From 6c709a3e4ff7dd6adb8ab65f8e9fa4d28274641b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 6 May 2011 14:52:41 -0400 Subject: [PATCH] Fix warnings and symbol visibility from missing CFLAGS --- compositor/compositor-drm.c | 5 ++++- compositor/compositor-wayland.c | 5 ++++- compositor/compositor-x11.c | 5 ++++- compositor/shell.c | 3 +++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c index f7ce0bf..11a44cc 100644 --- a/compositor/compositor-drm.c +++ b/compositor/compositor-drm.c @@ -627,7 +627,7 @@ drm_destroy(struct wlsc_compositor *ec) free(d); } -struct wlsc_compositor * +static struct wlsc_compositor * drm_compositor_create(struct wl_display *display, int connector) { struct drm_compositor *ec; @@ -721,6 +721,9 @@ drm_compositor_create(struct wl_display *display, int connector) } struct wlsc_compositor * +backend_init(struct wl_display *display, char *options); + +WL_EXPORT struct wlsc_compositor * backend_init(struct wl_display *display, char *options) { int connector = 0, i; diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c index b99edf0..1a53e8d 100644 --- a/compositor/compositor-wayland.c +++ b/compositor/compositor-wayland.c @@ -465,7 +465,7 @@ wayland_destroy(struct wlsc_compositor *ec) free(ec); } -struct wlsc_compositor * +static struct wlsc_compositor * wayland_compositor_create(struct wl_display *display, int width, int height) { struct wayland_compositor *c; @@ -520,6 +520,9 @@ wayland_compositor_create(struct wl_display *display, int width, int height) } struct wlsc_compositor * +backend_init(struct wl_display *display, char *options); + +WL_EXPORT struct wlsc_compositor * backend_init(struct wl_display *display, char *options) { int width = 1024, height = 640, i; diff --git a/compositor/compositor-x11.c b/compositor/compositor-x11.c index d7bebed..ac31881 100644 --- a/compositor/compositor-x11.c +++ b/compositor/compositor-x11.c @@ -626,7 +626,7 @@ x11_destroy(struct wlsc_compositor *ec) free(ec); } -struct wlsc_compositor * +static struct wlsc_compositor * x11_compositor_create(struct wl_display *display, int width, int height) { struct x11_compositor *c; @@ -683,6 +683,9 @@ x11_compositor_create(struct wl_display *display, int width, int height) } struct wlsc_compositor * +backend_init(struct wl_display *display, char *options); + +WL_EXPORT struct wlsc_compositor * backend_init(struct wl_display *display, char *options) { int width = 1024, height = 640, i; diff --git a/compositor/shell.c b/compositor/shell.c index 1dc2427..ab6218b 100644 --- a/compositor/shell.c +++ b/compositor/shell.c @@ -733,6 +733,9 @@ attach(struct wlsc_shell *shell, struct wlsc_surface *surface) { } +int +shell_init(struct wlsc_compositor *ec); + WL_EXPORT int shell_init(struct wlsc_compositor *ec) { -- 2.7.4