AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

scanner: don't emit the extern declarations for external types

Browse Source 
We were emitting the extern declarations of all types used in the protocol,
even if not defined in it. This caused warnings to be produced when using
the -Wredundant-decls compiler flag when building an extension that uses
e.g. wl_surface. However we only need the extern declarations if the
protocol defines a factory for those external interfaces. That is a
bad design and can be however done by including the dependent protocol
header first.
So only emit the extern declarations for the types that the protocol
actually defines, this restoring the behavior we were using in 1.7.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=90677

Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Arnaud Vrac <rawoul@gmail.com>
This commit is contained in:
Giulio Camuffo 2015-05-28 19:30:33 +03:00 committed by Pekka Paalanen
parent c19d5e1867
commit f0be757bfa
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scanner.c
View File

@ -1089,18 +1089,14 @@ emit_header(struct protocol *protocol, enum side side)
printf("struct %s;\n", *p);
prev = *p;
}
wl_array_release(&types);
printf("\n");
prev = NULL;
wl_array_for_each(p, &types) {
if (prev && strcmp(*p, prev) == 0)
continue;
wl_list_for_each(i, &protocol->interface_list, link) {
printf("extern const struct wl_interface "
"%s_interface;\n", *p);
prev = *p;
"%s_interface;\n", i->name);
}
wl_array_release(&types);
printf("\n");
wl_list_for_each(i, &protocol->interface_list, link) {