diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-12-02 14:20:35 +0100 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-01-17 18:24:53 +0100 |
| commit | 3d7ca3b9ea78f59d3d66228d28347c58355bc0e5 (patch) | |
| tree | e95177c760e250f48e1dad57e802c3bf0d7842c0 /compositor | |
| parent | 23e1d6f176c13034770cfe5b2a2c1ec86e9643c3 (diff) | |
libweston: Properly namespace modules entrypoint
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>
Diffstat (limited to 'compositor')
| -rw-r--r-- | compositor/cms-colord.c | 1 | ||||
| -rw-r--r-- | compositor/systemd-notify.c | 1 | ||||
| -rw-r--r-- | compositor/weston.h | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/compositor/cms-colord.c b/compositor/cms-colord.c index 152a7347..ae3ef25e 100644 --- a/compositor/cms-colord.c +++ b/compositor/cms-colord.c @@ -34,6 +34,7 @@ #include <colord.h> #include "compositor.h" +#include "weston.h" #include "cms-helper.h" #include "shared/helpers.h" diff --git a/compositor/systemd-notify.c b/compositor/systemd-notify.c index 49e51f40..ce18ede9 100644 --- a/compositor/systemd-notify.c +++ b/compositor/systemd-notify.c @@ -34,6 +34,7 @@ #include "shared/string-helpers.h" #include "shared/zalloc.h" #include "compositor.h" +#include "weston.h" struct systemd_notifier { int watchdog_time; diff --git a/compositor/weston.h b/compositor/weston.h index bb040020..2e0417c6 100644 --- a/compositor/weston.h +++ b/compositor/weston.h @@ -64,6 +64,10 @@ void * wet_load_module(const char *name, const char *entrypoint); int +module_init(struct weston_compositor *compositor, + int *argc, char *argv[]); + +int wet_load_xwayland(struct weston_compositor *comp); struct text_backend; |