summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2016-12-02 14:08:44 +0100
committerQuentin Glidic <sardemff7+git@sardemff7.net>2017-01-17 18:24:49 +0100
commit23e1d6f176c13034770cfe5b2a2c1ec86e9643c3 (patch)
tree4b22d3ea172ba5fd15e5b927633f5e403fd34a74
parentb2f32ab4a7c75628b5a10b4b2aef838b2ac0bb2c (diff)
libweston: Properly namespace backends entrypoint
This prevents loading a backend as a simple module. This will avoid messing up with backends when we will introduce libweston common modules. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
-rw-r--r--libweston/compositor-drm.c4
-rw-r--r--libweston/compositor-fbdev.c4
-rw-r--r--libweston/compositor-headless.c4
-rw-r--r--libweston/compositor-rdp.c4
-rw-r--r--libweston/compositor-wayland.c4
-rw-r--r--libweston/compositor-x11.c4
-rw-r--r--libweston/compositor.c2
-rw-r--r--libweston/compositor.h4
8 files changed, 15 insertions, 15 deletions
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index c7f7f636..81160528 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -3304,8 +3304,8 @@ config_init_to_defaults(struct weston_drm_backend_config *config)
}
WL_EXPORT int
-backend_init(struct weston_compositor *compositor,
- struct weston_backend_config *config_base)
+weston_backend_init(struct weston_compositor *compositor,
+ struct weston_backend_config *config_base)
{
struct drm_backend *b;
struct weston_drm_backend_config config = {{ 0, }};
diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c
index 0c45e984..44f0cf51 100644
--- a/libweston/compositor-fbdev.c
+++ b/libweston/compositor-fbdev.c
@@ -782,8 +782,8 @@ config_init_to_defaults(struct weston_fbdev_backend_config *config)
}
WL_EXPORT int
-backend_init(struct weston_compositor *compositor,
- struct weston_backend_config *config_base)
+weston_backend_init(struct weston_compositor *compositor,
+ struct weston_backend_config *config_base)
{
struct fbdev_backend *b;
struct weston_fbdev_backend_config config = {{ 0, }};
diff --git a/libweston/compositor-headless.c b/libweston/compositor-headless.c
index e7fc3970..a1aec6d7 100644
--- a/libweston/compositor-headless.c
+++ b/libweston/compositor-headless.c
@@ -316,8 +316,8 @@ config_init_to_defaults(struct weston_headless_backend_config *config)
}
WL_EXPORT int
-backend_init(struct weston_compositor *compositor,
- struct weston_backend_config *config_base)
+weston_backend_init(struct weston_compositor *compositor,
+ struct weston_backend_config *config_base)
{
struct headless_backend *b;
struct weston_headless_backend_config config = {{ 0, }};
diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c
index 223382ce..4674612f 100644
--- a/libweston/compositor-rdp.c
+++ b/libweston/compositor-rdp.c
@@ -1370,8 +1370,8 @@ config_init_to_defaults(struct weston_rdp_backend_config *config)
}
WL_EXPORT int
-backend_init(struct weston_compositor *compositor,
- struct weston_backend_config *config_base)
+weston_backend_init(struct weston_compositor *compositor,
+ struct weston_backend_config *config_base)
{
struct rdp_backend *b;
struct weston_rdp_backend_config config = {{ 0, }};
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index b2d3c077..9d35ef77 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -2578,8 +2578,8 @@ config_init_to_defaults(struct weston_wayland_backend_config *config)
}
WL_EXPORT int
-backend_init(struct weston_compositor *compositor,
- struct weston_backend_config *config_base)
+weston_backend_init(struct weston_compositor *compositor,
+ struct weston_backend_config *config_base)
{
struct wayland_backend *b;
struct wayland_parent_output *poutput;
diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
index 627bb15f..f9cb4612 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -1756,8 +1756,8 @@ config_init_to_defaults(struct weston_x11_backend_config *config)
}
WL_EXPORT int
-backend_init(struct weston_compositor *compositor,
- struct weston_backend_config *config_base)
+weston_backend_init(struct weston_compositor *compositor,
+ struct weston_backend_config *config_base)
{
struct x11_backend *b;
struct weston_x11_backend_config config = {{ 0, }};
diff --git a/libweston/compositor.c b/libweston/compositor.c
index a5ce76d0..2660264e 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -5399,7 +5399,7 @@ weston_compositor_load_backend(struct weston_compositor *compositor,
if (backend >= ARRAY_LENGTH(backend_map))
return -1;
- backend_init = weston_load_module(backend_map[backend], "backend_init");
+ backend_init = weston_load_module(backend_map[backend], "weston_backend_init");
if (!backend_init)
return -1;
diff --git a/libweston/compositor.h b/libweston/compositor.h
index 973d2ee0..1e57b3ff 100644
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -1815,8 +1815,8 @@ int
weston_input_init(struct weston_compositor *compositor);
int
-backend_init(struct weston_compositor *c,
- struct weston_backend_config *config_base);
+weston_backend_init(struct weston_compositor *c,
+ struct weston_backend_config *config_base);
int
module_init(struct weston_compositor *compositor,
int *argc, char *argv[]);