summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-05-06 14:52:41 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-05-06 14:52:41 -0400
commit6c709a3e4ff7dd6adb8ab65f8e9fa4d28274641b (patch)
treeda0759256bd6d73526a9f76202090c0aaa8f8466
parentbbefb136d19663b507eead2f575e4bc3d272183c (diff)
Fix warnings and symbol visibility from missing CFLAGS
-rw-r--r--compositor/compositor-drm.c5
-rw-r--r--compositor/compositor-wayland.c5
-rw-r--r--compositor/compositor-x11.c5
-rw-r--r--compositor/shell.c3
4 files changed, 15 insertions, 3 deletions
diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c
index f7ce0bf1..11a44cc4 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 b99edf0b..1a53e8db 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 d7bebed8..ac31881d 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 1dc2427b..ab6218b7 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)
{