From c380adc554a3d0e2a567ff07deab020a3068304c Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 28 Dec 2017 15:30:09 +0000 Subject: [PATCH] client: Remove WL_ZOMBIE_OBJECT global Since we now have the WL_MAP_ENTRY_ZOMBIE flag to determine whether or not a client-side object is a zombie, we can remove the faux object. [daniels: Extracted from Derek's bespoke-zombie patch as an intermediate step.] Signed-off-by: Derek Foreman Reviewed-by: Daniel Stone --- src/wayland-client.c | 2 +- src/wayland-private.h | 3 --- src/wayland-util.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/wayland-client.c b/src/wayland-client.c index 83f76ec..21ef5b0 100644 --- a/src/wayland-client.c +++ b/src/wayland-client.c @@ -411,7 +411,7 @@ proxy_destroy(struct wl_proxy *proxy) wl_map_insert_at(&proxy->display->objects, WL_MAP_ENTRY_ZOMBIE, proxy->object.id, - WL_ZOMBIE_OBJECT); + NULL); } else { wl_map_insert_at(&proxy->display->objects, 0, proxy->object.id, NULL); diff --git a/src/wayland-private.h b/src/wayland-private.h index b0d129f..8e94864 100644 --- a/src/wayland-private.h +++ b/src/wayland-private.h @@ -57,9 +57,6 @@ struct wl_object { uint32_t id; }; -extern struct wl_object global_zombie_object; -#define WL_ZOMBIE_OBJECT ((void*)&global_zombie_object) - int wl_interface_equal(const struct wl_interface *iface1, const struct wl_interface *iface2); diff --git a/src/wayland-util.c b/src/wayland-util.c index ce387f4..3a471a8 100644 --- a/src/wayland-util.c +++ b/src/wayland-util.c @@ -153,8 +153,6 @@ wl_array_copy(struct wl_array *array, struct wl_array *source) /** \cond */ -struct wl_object global_zombie_object; - int wl_interface_equal(const struct wl_interface *a, const struct wl_interface *b) { -- 2.7.4