mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: Properly namespace backends entrypoint

Browse Source 
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>
This commit is contained in:
Quentin Glidic
2016-12-02 14:08:44 +01:00
parent b2f32ab4a7
commit 23e1d6f176
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+2 -2
View File
@@ -3304,8 +3304,8 @@ config_init_to_defaults(struct weston_drm_backend_config *config)
} }
WL_EXPORT int WL_EXPORT int
backend_init(struct weston_compositor *compositor, weston_backend_init(struct weston_compositor *compositor,
struct weston_backend_config *config_base) struct weston_backend_config *config_base)
{ {
struct drm_backend *b; struct drm_backend *b;
struct weston_drm_backend_config config = {{ 0, }}; struct weston_drm_backend_config config = {{ 0, }};
libweston/compositor-fbdev.c
+2 -2
View File
@@ -782,8 +782,8 @@ config_init_to_defaults(struct weston_fbdev_backend_config *config)
} }
WL_EXPORT int WL_EXPORT int
backend_init(struct weston_compositor *compositor, weston_backend_init(struct weston_compositor *compositor,
struct weston_backend_config *config_base) struct weston_backend_config *config_base)
{ {
struct fbdev_backend *b; struct fbdev_backend *b;
struct weston_fbdev_backend_config config = {{ 0, }}; struct weston_fbdev_backend_config config = {{ 0, }};
libweston/compositor-headless.c
+2 -2
View File
@@ -316,8 +316,8 @@ config_init_to_defaults(struct weston_headless_backend_config *config)
} }
WL_EXPORT int WL_EXPORT int
backend_init(struct weston_compositor *compositor, weston_backend_init(struct weston_compositor *compositor,
struct weston_backend_config *config_base) struct weston_backend_config *config_base)
{ {
struct headless_backend *b; struct headless_backend *b;
struct weston_headless_backend_config config = {{ 0, }}; struct weston_headless_backend_config config = {{ 0, }};
libweston/compositor-rdp.c
+2 -2
View File
@@ -1370,8 +1370,8 @@ config_init_to_defaults(struct weston_rdp_backend_config *config)
} }
WL_EXPORT int WL_EXPORT int
backend_init(struct weston_compositor *compositor, weston_backend_init(struct weston_compositor *compositor,
struct weston_backend_config *config_base) struct weston_backend_config *config_base)
{ {
struct rdp_backend *b; struct rdp_backend *b;
struct weston_rdp_backend_config config = {{ 0, }}; struct weston_rdp_backend_config config = {{ 0, }};
libweston/compositor-wayland.c
+2 -2
View File
@@ -2578,8 +2578,8 @@ config_init_to_defaults(struct weston_wayland_backend_config *config)
} }
WL_EXPORT int WL_EXPORT int
backend_init(struct weston_compositor *compositor, weston_backend_init(struct weston_compositor *compositor,
struct weston_backend_config *config_base) struct weston_backend_config *config_base)
{ {
struct wayland_backend *b; struct wayland_backend *b;
struct wayland_parent_output *poutput; struct wayland_parent_output *poutput;
libweston/compositor-x11.c
+2 -2
View File
@@ -1756,8 +1756,8 @@ config_init_to_defaults(struct weston_x11_backend_config *config)
} }
WL_EXPORT int WL_EXPORT int
backend_init(struct weston_compositor *compositor, weston_backend_init(struct weston_compositor *compositor,
struct weston_backend_config *config_base) struct weston_backend_config *config_base)
{ {
struct x11_backend *b; struct x11_backend *b;
struct weston_x11_backend_config config = {{ 0, }}; struct weston_x11_backend_config config = {{ 0, }};
libweston/compositor.c
+1 -1
View File
@@ -5399,7 +5399,7 @@ weston_compositor_load_backend(struct weston_compositor *compositor,
if (backend >= ARRAY_LENGTH(backend_map)) if (backend >= ARRAY_LENGTH(backend_map))
return -1; 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) if (!backend_init)
return -1; return -1;
libweston/compositor.h
+2 -2
View File
@@ -1815,8 +1815,8 @@ int
weston_input_init(struct weston_compositor *compositor); weston_input_init(struct weston_compositor *compositor);
int int
backend_init(struct weston_compositor *c, weston_backend_init(struct weston_compositor *c,
struct weston_backend_config *config_base); struct weston_backend_config *config_base);
int int
module_init(struct weston_compositor *compositor, module_init(struct weston_compositor *compositor,
int *argc, char *argv[]); int *argc, char *argv[]);