[PATCH wayland 1/4] wayland-util: do not export the wl_map_* API

Emil Velikov emil.l.velikov at gmail.com
Tue Aug 30 17:24:19 UTC 2016


From: Emil Velikov <emil.velikov at collabora.com>

Use 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.velikov at collabora.com>
---
I could not find any users of the API and I doubt there was ever one. If
people feel nervous about this, we can keep it.
---
 src/wayland-util.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/wayland-util.c b/src/wayland-util.c
index 7467366..0cdbada 100644
--- a/src/wayland-util.c
+++ b/src/wayland-util.c
@@ -176,21 +176,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;
@@ -222,7 +222,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;
@@ -250,7 +250,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;
@@ -289,7 +289,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;
@@ -313,7 +313,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;
@@ -336,7 +336,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;
@@ -372,7 +372,7 @@ for_each_helper(struct wl_array *entries, wl_iterator_func_t func, void *data)
 			func(map_entry_get_data(*p), data);
 }
 
-WL_EXPORT void
+void
 wl_map_for_each(struct wl_map *map, wl_iterator_func_t func, void *data)
 {
 	for_each_helper(&map->client_entries, func, data);
-- 
2.9.0



More information about the wayland-devel mailing list