mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-31 22:25:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scanner: prepend protocol name to types symbol

Browse source 
When doing unity builds via meson (example project:
https://github.com/swaywm/sway) multiple source files are glued together
via #include directives. Having every wayland-scanner generated source
file have an identifier named '*types[]' will lead to errors in these
unity builds if two or more of these are joined.

Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
This commit is contained in:
Marty E. Plummer 2019-05-11 09:53:01 -05:00
parent a89a5349af
commit 9f004d8b0f
No known key found for this signature in database
GPG key ID: 47BC0C716C0747F2
5 changed files with 140 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/scanner.c
View file

@ -1722,7 +1722,7 @@ emit_types(struct protocol *protocol, struct wl_list *message_list)
}
static void
emit_messages(struct wl_list *message_list,
emit_messages(const char *name, struct wl_list *message_list,
struct interface *interface, const char *suffix)
{
struct message *m;
@ -1775,7 +1775,7 @@ emit_messages(struct wl_list *message_list,
break;
}
}
printf("\", types + %d },\n", m->type_index);
printf("\", %s_types + %d },\n", name, m->type_index);
}
printf("};\n\n");
@ -1832,7 +1832,7 @@ emit_code(struct protocol *protocol, enum visibility vis)
wl_array_release(&types);
printf("\n");
printf("static const struct wl_interface *types[] = {\n");
printf("static const struct wl_interface *%s_types[] = {\n", protocol->name);
emit_null_run(protocol);
wl_list_for_each(i, &protocol->interface_list, link) {
emit_types(protocol, &i->request_list);
@ -1842,8 +1842,8 @@ emit_code(struct protocol *protocol, enum visibility vis)
wl_list_for_each_safe(i, next, &protocol->interface_list, link) {
emit_messages(&i->request_list, i, "requests");
emit_messages(&i->event_list, i, "events");
emit_messages(protocol->name, &i->request_list, i, "requests");
emit_messages(protocol->name, &i->event_list, i, "events");
printf("%s const struct wl_interface "
"%s_interface = {\n"