mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-04-05 07:15:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

client: Remove WL_ZOMBIE_OBJECT global

Browse source 
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 <derekf@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Derek Foreman 2017-12-28 15:30:09 +00:00 • committed by Daniel Stone
parent 712ba320db
commit c380adc554
3 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wayland-client.c
View file

@ -411,7 +411,7 @@ proxy_destroy(struct wl_proxy *proxy)
wl_map_insert_at(&proxy->display->objects, wl_map_insert_at(&proxy->display->objects,
WL_MAP_ENTRY_ZOMBIE, WL_MAP_ENTRY_ZOMBIE,
proxy->object.id, proxy->object.id,
WL_ZOMBIE_OBJECT); NULL);
} else { } else {
wl_map_insert_at(&proxy->display->objects, 0, wl_map_insert_at(&proxy->display->objects, 0,
proxy->object.id, NULL); proxy->object.id, NULL);

3
src/wayland-private.h
View file

@ -57,9 +57,6 @@ struct wl_object {
uint32_t id; uint32_t id;
}; };
extern struct wl_object global_zombie_object;
#define WL_ZOMBIE_OBJECT ((void*)&global_zombie_object)
int int
wl_interface_equal(const struct wl_interface *iface1, wl_interface_equal(const struct wl_interface *iface1,
const struct wl_interface *iface2); const struct wl_interface *iface2);

2
src/wayland-util.c
View file

@ -153,8 +153,6 @@ wl_array_copy(struct wl_array *array, struct wl_array *source)
/** \cond */ /** \cond */
struct wl_object global_zombie_object;
int int
wl_interface_equal(const struct wl_interface *a, const struct wl_interface *b) wl_interface_equal(const struct wl_interface *a, const struct wl_interface *b)
{ {