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

libweston: Properly namespace modules entrypoint

Browse Source 
Use different functions so we cannot load a libweston common module in
weston directly or the other way around.

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:20:35 +01:00
parent 23e1d6f176
commit 3d7ca3b9ea
11 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor.c
+3 -5
View File
@@ -5409,14 +5409,12 @@ weston_compositor_load_backend(struct weston_compositor *compositor,
WL_EXPORT int
weston_compositor_load_xwayland(struct weston_compositor *compositor)
{
int (*module_init)(struct weston_compositor *ec,
int *argc, char *argv[]);
int argc = 0;
int (*module_init)(struct weston_compositor *ec);
module_init = weston_load_module("xwayland.so", "module_init");
module_init = weston_load_module("xwayland.so", "weston_module_init");
if (!module_init)
return -1;
if (module_init(compositor, &argc, NULL) < 0)
if (module_init(compositor) < 0)
return -1;
return 0;
}
libweston/compositor.h
+1 -2
View File
@@ -1818,8 +1818,7 @@ int
weston_backend_init(struct weston_compositor *c,
struct weston_backend_config *config_base);
int
module_init(struct weston_compositor *compositor,
int *argc, char *argv[]);
weston_module_init(struct weston_compositor *compositor);
void
weston_transformed_coord(int width, int height,