diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-12-02 14:21:46 +0100 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-01-17 18:24:56 +0100 |
| commit | 8af2beccbd91c2f555eb5e5aa4f8e0455ab28eff (patch) | |
| tree | c61ab40e34a23215837dc02079250cf6eba5a955 /ivi-shell | |
| parent | 3d7ca3b9ea78f59d3d66228d28347c58355bc0e5 (diff) | |
weston: Properly namespace modules entrypoint
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'ivi-shell')
| -rw-r--r-- | ivi-shell/ivi-layout.c | 4 | ||||
| -rw-r--r-- | ivi-shell/ivi-shell.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index ada7a7c6..bbf1bcba 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -2120,7 +2120,9 @@ load_controller_modules(struct weston_compositor *compositor, const char *module end = strchrnul(p, ','); snprintf(buffer, sizeof buffer, "%.*s", (int)(end - p), p); - controller_module_init = wet_load_module(buffer, "controller_module_init"); + controller_module_init = + wet_load_module_entrypoint(buffer, + "controller_module_init"); if (!controller_module_init) return -1; diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c index c8d59820..43329951 100644 --- a/ivi-shell/ivi-shell.c +++ b/ivi-shell/ivi-shell.c @@ -492,8 +492,8 @@ shell_add_bindings(struct weston_compositor *compositor, * Initialization of ivi-shell. */ WL_EXPORT int -module_init(struct weston_compositor *compositor, - int *argc, char *argv[]) +wet_module_init(struct weston_compositor *compositor, + int *argc, char *argv[]) { struct ivi_shell *shell; struct ivi_shell_setting setting = { }; |