diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-10-05 12:06:41 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-10-05 11:57:38 +0000 |
| commit | 1e928a36cb477b558d9be8130f2843a92b3ffe43 (patch) | |
| tree | 4036a601b1d94c636d8320b6980b454e42fe3e4c /src/qtwaylandscanner | |
| parent | 6d08990b771614dc6ba6018b5d4cdb97b693b8f5 (diff) | |
| download | qtwayland-1e928a36cb477b558d9be8130f2843a92b3ffe43.tar.gz | |
Fix compilation with libwayland < 1.10 (again)
wl_proxy_marshal_constructor_versioned was added in libwayland v1.10.0, use the
old way with wl_proxy_marshal_constructor for older versions instead.
Change-Id: I4514212e0b44ecbf200769759667186f71b279b6
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/qtwaylandscanner')
| -rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 4494b7c6..1da8bdb4 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -1064,8 +1064,13 @@ bool Scanner::process() printf("static inline void *wlRegistryBind(struct ::wl_registry *registry, uint32_t name, const struct ::wl_interface *interface, uint32_t version)\n"); printf("{\n"); printf(" const uint32_t bindOpCode = 0;\n"); + printf("#if (WAYLAND_VERSION_MAJOR == 1 && WAYLAND_VERSION_MINOR > 10) || WAYLAND_VERSION_MAJOR > 1\n"); printf(" return (void *) wl_proxy_marshal_constructor_versioned((struct wl_proxy *) registry,\n"); - printf(" bindOpCode, interface, version, name, interface->name, version, NULL);\n"); + printf(" bindOpCode, interface, version, name, interface->name, version, nullptr);\n"); + printf("#else\n"); + printf(" return (void *) wl_proxy_marshal_constructor((struct wl_proxy *) registry,\n"); + printf(" bindOpCode, interface, name, interface->name, version, nullptr);\n"); + printf("#endif\n"); printf("}\n"); printf("\n"); for (int j = 0; j < interfaces.size(); ++j) { |