On Tue, 21 Feb 2017 16:14:26 +0000 Emil Velikov <emil.l.veli...@gmail.com> wrote:
> From: Emil Velikov <emil.veli...@collabora.com> > > Used only internally and explicitly marked as such with commit > cf04b0a18f2 ("Move private definitions and prototypes to new > zwayland-private.h") > > Signed-off-by: Emil Velikov <emil.veli...@collabora.com> > --- > src/wayland-util.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) Hi, R-b me and pushed: 9b78be6..654dee8 master -> master Let's see if anyone screams and forces us to revert. These have not been in public headers even in 1.0 release. I verified with 'nm -g --defined-only' that this patch indeed does stop exporting the symbols. I haven't looked at the other patches yet, this seemed like something to get in early in a release cycle. I still can't make my mind about the extra .so introduced in patch 3. Thanks, pq > > diff --git a/src/wayland-util.c b/src/wayland-util.c > index 077fec7..cab7fc5 100644 > --- a/src/wayland-util.c > +++ b/src/wayland-util.c > @@ -177,21 +177,21 @@ union map_entry { > #define map_entry_get_data(entry) ((void *)((entry).next & ~(uintptr_t)0x3)) > #define map_entry_get_flags(entry) (((entry).next >> 1) & 0x1) > > -WL_EXPORT void > +void > wl_map_init(struct wl_map *map, uint32_t side) > { > memset(map, 0, sizeof *map); > map->side = side; > } > > -WL_EXPORT void > +void > wl_map_release(struct wl_map *map) > { > wl_array_release(&map->client_entries); > wl_array_release(&map->server_entries); > } > > -WL_EXPORT uint32_t > +uint32_t > wl_map_insert_new(struct wl_map *map, uint32_t flags, void *data) > { > union map_entry *start, *entry; > @@ -223,7 +223,7 @@ wl_map_insert_new(struct wl_map *map, uint32_t flags, > void *data) > return (entry - start) + base; > } > > -WL_EXPORT int > +int > wl_map_insert_at(struct wl_map *map, uint32_t flags, uint32_t i, void *data) > { > union map_entry *start; > @@ -251,7 +251,7 @@ wl_map_insert_at(struct wl_map *map, uint32_t flags, > uint32_t i, void *data) > return 0; > } > > -WL_EXPORT int > +int > wl_map_reserve_new(struct wl_map *map, uint32_t i) > { > union map_entry *start; > @@ -290,7 +290,7 @@ wl_map_reserve_new(struct wl_map *map, uint32_t i) > return 0; > } > > -WL_EXPORT void > +void > wl_map_remove(struct wl_map *map, uint32_t i) > { > union map_entry *start; > @@ -314,7 +314,7 @@ wl_map_remove(struct wl_map *map, uint32_t i) > map->free_list = (i << 1) | 1; > } > > -WL_EXPORT void * > +void * > wl_map_lookup(struct wl_map *map, uint32_t i) > { > union map_entry *start; > @@ -337,7 +337,7 @@ wl_map_lookup(struct wl_map *map, uint32_t i) > return NULL; > } > > -WL_EXPORT uint32_t > +uint32_t > wl_map_lookup_flags(struct wl_map *map, uint32_t i) > { > union map_entry *start; > @@ -379,7 +379,7 @@ for_each_helper(struct wl_array *entries, > wl_iterator_func_t func, void *data) > return ret; > } > > -WL_EXPORT void > +void > wl_map_for_each(struct wl_map *map, wl_iterator_func_t func, void *data) > { > enum wl_iterator_result ret;
pgp7_lqI0GLf9.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel