[PATCH weston] fix module_init signature in module tests

Othman, Ossama ossama.othman at intel.com
Fri May 17 08:53:00 PDT 2013


Hi Artie,

Sorry about that.  I didn't realize some Weston binaries were only built
under the "check" target.   I'll run "make distcheck" the next time around.

Thanks for the fix!
-Ossama



On Fri, May 17, 2013 at 6:12 AM, U. Artie Eoff <ullysses.a.eoff at intel.com>wrote:

> From: "U. Artie Eoff" <ullysses.a.eoff at intel.com>
>
> surface-global-test and surface-test did not get updated to
> the new module_init(...) signature when it changed in
> a50e6e4c500e3080b8df7ec14c7e42741477a423.  Thus, they
> failed to compile.  Simply running 'make check' shows the
> problem. This patch fixes it.
>
> fixes https://bugs.freedesktop.org/show_bug.cgi?id=64691
>
> Signed-off-by: U. Artie Eoff <ullysses.a.eoff at intel.com>
> ---
>  tests/surface-global-test.c | 3 +--
>  tests/surface-test.c        | 3 +--
>  2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/tests/surface-global-test.c b/tests/surface-global-test.c
> index 5bafa08..220cb51 100644
> --- a/tests/surface-global-test.c
> +++ b/tests/surface-global-test.c
> @@ -67,8 +67,7 @@ surface_to_from_global(void *data)
>  }
>
>  WL_EXPORT int
> -module_init(struct weston_compositor *compositor,
> -           int *argc, char *argv[], const char *config_file)
> +module_init(struct weston_compositor *compositor, int *argc, char *argv[])
>  {
>         struct wl_event_loop *loop;
>
> diff --git a/tests/surface-test.c b/tests/surface-test.c
> index 8157e33..73ee23c 100644
> --- a/tests/surface-test.c
> +++ b/tests/surface-test.c
> @@ -50,8 +50,7 @@ surface_transform(void *data)
>  }
>
>  WL_EXPORT int
> -module_init(struct weston_compositor *compositor,
> -           int *argc, char *argv[], const char *config_file)
> +module_init(struct weston_compositor *compositor, int *argc, char *argv[])
>  {
>         struct wl_event_loop *loop;
>
> --
> 1.7.11.7
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20130517/a32d5d97/attachment.html>


More information about the wayland-devel mailing list