[PATCH wayland v2 2/2] scanner: Fix header generation for server protocols

[Marek Chalupa]

Reviewed-by: Marek Chalupa <mchqwerty at gmail.com>

On 19 December 2014 at 15:02, Pekka Paalanen <ppaalanen at gmail.com> wrote:
>
> On Mon, 15 Dec 2014 12:48:38 +0100
> Mariusz Ceier <mceier+wayland at gmail.com> wrote:
>
> > Server protocols headers should include wayland-server.h,
> > instead of wayland-util.h. Otherwise they're not useable
> > with C++ compiler unless wayland-server.h was included
> > earlier.
> >
> > Signed-off-by: Mariusz Ceier <mceier+wayland at gmail.com>
> > ---
> >
> > Notes:
> >     v2: s/generatation/generation/
> >
> >  src/scanner.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/scanner.c b/src/scanner.c
> > index ca03c57..1f1e59a 100644
> > --- a/src/scanner.c
> > +++ b/src/scanner.c
> > @@ -1002,7 +1002,7 @@ emit_header(struct protocol *protocol, enum side
> side)
> >              "struct wl_resource;\n\n",
> >              protocol->uppercase_name, s,
> >              protocol->uppercase_name, s,
> > -            (side == SERVER) ? "wayland-util.h" : "wayland-client.h");
> > +            (side == SERVER) ? "wayland-server.h" : "wayland-client.h");
> >
> >       wl_list_for_each(i, &protocol->interface_list, link)
> >               printf("struct %s;\n", i->name);
>
> These two look good to me. Can anyone else say something?
>
>
> Thanks,
> pq
> _______________________________________________
> 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/20141219/f3cd0be4/attachment-0001.html>