diff options
| author | Marty E. Plummer <hanetzer@startmail.com> | 2019-05-11 09:53:01 -0500 |
|---|---|---|
| committer | Marty E. Plummer <hanetzer@startmail.com> | 2019-09-11 13:27:03 -0500 |
| commit | 9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4 (patch) | |
| tree | 67a90352370263a6e5ed131dee186fac0f6972d1 /tests/data/small-code.c | |
| parent | tests: Test that send overflow doesn't abort (diff) | |
| download | wayland-9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4.tar wayland-9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4.tar.gz wayland-9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4.tar.bz2 wayland-9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4.tar.lz wayland-9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4.tar.xz wayland-9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4.tar.zst wayland-9f004d8b0fa37787fe96662cf5ff414e8d6ef5e4.zip | |
scanner: prepend protocol name to types symbol
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>
Diffstat (limited to 'tests/data/small-code.c')
| -rw-r--r-- | tests/data/small-code.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/data/small-code.c b/tests/data/small-code.c index 28a00ab..bd6d33d 100644 --- a/tests/data/small-code.c +++ b/tests/data/small-code.c @@ -32,7 +32,7 @@ extern const struct wl_interface another_intf_interface; extern const struct wl_interface intf_not_here_interface; -static const struct wl_interface *types[] = { +static const struct wl_interface *small_test_types[] = { NULL, &intf_not_here_interface, NULL, @@ -44,13 +44,13 @@ static const struct wl_interface *types[] = { }; static const struct wl_message intf_A_requests[] = { - { "rq1", "sun", types + 0 }, - { "rq2", "nsiufho", types + 1 }, - { "destroy", "", types + 0 }, + { "rq1", "sun", small_test_types + 0 }, + { "rq2", "nsiufho", small_test_types + 1 }, + { "destroy", "", small_test_types + 0 }, }; static const struct wl_message intf_A_events[] = { - { "hey", "", types + 0 }, + { "hey", "", small_test_types + 0 }, }; WL_EXPORT const struct wl_interface intf_A_interface = { |