From ed38c063a84cca244c1528ecddb956abdc8018a8 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 14 Sep 2018 15:20:03 +0200 Subject: Remove ifdefs for unsupported libwayland versions The ifdefs were for version 1.2.0. Change-Id: Ie58745c7cf4c0fba45bc5203d24e9913d3a8b8ce Reviewed-by: Paul Olav Tvete --- tests/auto/client/shared/mocksurface.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tests') diff --git a/tests/auto/client/shared/mocksurface.cpp b/tests/auto/client/shared/mocksurface.cpp index 4de4265d7..c0d51618c 100644 --- a/tests/auto/client/shared/mocksurface.cpp +++ b/tests/auto/client/shared/mocksurface.cpp @@ -161,14 +161,7 @@ void Surface::surface_commit(Resource *resource) Q_UNUSED(resource); if (m_buffer) { -#if WAYLAND_VERSION_CHECK(1, 2, 0) struct ::wl_shm_buffer *shm_buffer = wl_shm_buffer_get(m_buffer); -#else - struct ::wl_buffer *shm_buffer = 0; - if (wl_buffer_is_shm(static_cast(m_buffer->data))) - shm_buffer = static_cast(m_buffer->data); -#endif - if (shm_buffer) { int stride = wl_shm_buffer_get_stride(shm_buffer); uint format = wl_shm_buffer_get_format(shm_buffer); -- cgit v1.2.3