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>

diff --git a/compositor/cms-colord.c b/compositor/cms-colord.c
index 152a7347651f00893056fd1b37f8329846becd77..ae3ef25e65afb7a5214abf241410576f9637f45c 100644 (file)
--- 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 49e51f40c895860632fed5ecc86b061d4fcbd69d..ce18ede988e6223769598928f0eb4d7ca19c9811 100644 (file)
--- 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 bb04002097c239e939e9bed0310308500a4ff647..2e0417c6975daf4b15bb6e063dd197df29b7dac9 100644 (file)
--- a/compositor/weston.h
+++ b/compositor/weston.h
@@ -63,6 +63,10 @@ wet_get_config(struct weston_compositor *compositor);
 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);
 

diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c
index daf024e5557047cd30baec89882ce60bc3c7bdec..af774747fbae434cb1c389a7294611e11bd5e95e 100644 (file)
--- a/fullscreen-shell/fullscreen-shell.c
+++ b/fullscreen-shell/fullscreen-shell.c
@@ -34,6 +34,7 @@
 #include <assert.h>
 
 #include "compositor.h"
+#include "compositor/weston.h"
 #include "fullscreen-shell-unstable-v1-server-protocol.h"
 #include "shared/helpers.h"
 

diff --git a/libweston/compositor.c b/libweston/compositor.c
index 2660264e1b2bbb8ffa234ffa408610c8fb1d53da..5e23277874314f1e376860aaa8e9e8e4f50ca1f0 100644 (file)
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -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;
 }

diff --git a/libweston/compositor.h b/libweston/compositor.h
index 1e57b3fff8c5119b33a08e29331bd4836c8f22b0..b049c9801c0f91801429f9feeee05d7669f90029 100644 (file)
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -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,

diff --git a/tests/plugin-registry-test.c b/tests/plugin-registry-test.c
index 7fc88f394079ea81b1f503c1dbc8ea5ec16b55eb..2a32e01e8df1cd41daedf2f577046b3e529d60d3 100644 (file)
--- a/tests/plugin-registry-test.c
+++ b/tests/plugin-registry-test.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 
 #include "compositor.h"
+#include "compositor/weston.h"
 #include "plugin-registry.h"
 
 static void

diff --git a/tests/surface-global-test.c b/tests/surface-global-test.c
index 55899c67183f3cbd3650f691be28ccfe63c63f21..20d99ce9a3e482a9c0f05b26e36adfb0564d3a1e 100644 (file)
--- a/tests/surface-global-test.c
+++ b/tests/surface-global-test.c
@@ -29,6 +29,7 @@
 #include <stdint.h>
 
 #include "compositor.h"
+#include "compositor/weston.h"
 
 static void
 surface_to_from_global(void *data)

diff --git a/tests/surface-screenshot.c b/tests/surface-screenshot.c
index 332b5e39534f8719796a863f84ae4870535c0def..6ff2bfc5bb89733e5a83555f0778279da6869640 100644 (file)
--- a/tests/surface-screenshot.c
+++ b/tests/surface-screenshot.c
@@ -34,6 +34,7 @@
 #include <linux/input.h>
 
 #include "compositor.h"
+#include "compositor/weston.h"
 #include "file-util.h"
 
 static char *

diff --git a/tests/surface-test.c b/tests/surface-test.c
index 243f8dc32808b520f060512d111559126326919c..4463061063e8bf6f8e94451e32670542ea3fe49d 100644 (file)
--- a/tests/surface-test.c
+++ b/tests/surface-test.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include "compositor.h"
+#include "compositor/weston.h"
 
 static void
 surface_transform(void *data)

diff --git a/xwayland/launcher.c b/xwayland/launcher.c
index 276795af67158c46839500d74574a9b6d184de25..0ecdb205e35476ca7929eadc3922b1650c115d81 100644 (file)
--- a/xwayland/launcher.c
+++ b/xwayland/launcher.c
@@ -351,8 +351,7 @@ const struct weston_xwayland_api api = {
 extern const struct weston_xwayland_surface_api surface_api;
 
 WL_EXPORT int
-module_init(struct weston_compositor *compositor,
-           int *argc, char *argv[])
+weston_module_init(struct weston_compositor *compositor)
 
 {
        struct wl_display *display = compositor->wl_display;