From: Dima Krasner <dima@dimakrasner.com>
Date: Mon, 8 Nov 2021 18:17:08 +0000 (+0200)
Subject: build: fix name collision with wlroots, when linking statically
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=04450b5e4de70ac71b3a50b518e0ed507d31a871;p=proto%2Flabwc.git

build: fix name collision with wlroots, when linking statically
---

diff --git a/include/labwc.h b/include/labwc.h
index b2a4ff78..b45b53e7 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -342,7 +342,7 @@ void xwayland_unmanaged_create(struct server *server,
 void view_child_init(struct view_child *child, struct view *view,
 	struct wlr_surface *wlr_surface);
 void view_child_finish(struct view_child *child);
-void subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface);
+void view_subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface);
 
 void view_set_activated(struct view *view, bool activated);
 struct border view_border(struct view *view);
diff --git a/src/subsurface.c b/src/subsurface.c
index b37cabda..79866355 100644
--- a/src/subsurface.c
+++ b/src/subsurface.c
@@ -21,7 +21,7 @@ subsurface_handle_destroy(struct wl_listener *listener, void *data)
 }
 
 void
-subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface)
+view_subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface)
 {
 	struct view_subsurface *subsurface =
 		calloc(1, sizeof(struct view_subsurface));
diff --git a/src/view-child.c b/src/view-child.c
index dbb30596..462a53a4 100644
--- a/src/view-child.c
+++ b/src/view-child.c
@@ -19,7 +19,7 @@ view_child_handle_new_subsurface(struct wl_listener *listener, void *data)
 	struct view_child *child;
 	child = wl_container_of(listener, child, new_subsurface);
 	struct wlr_subsurface *wlr_subsurface = data;
-	subsurface_create(child->parent, wlr_subsurface);
+	view_subsurface_create(child->parent, wlr_subsurface);
 }
 
 void
diff --git a/src/xdg.c b/src/xdg.c
index f9fe0059..6ad5b6d6 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -4,7 +4,7 @@
 #include "ssd.h"
 
 /*
- * xdg_popup_create() and subsurface_create() are only called for the
+ * xdg_popup_create() and view_subsurface_create() are only called for the
  * purposes of tracking damage.
  */
 static void
@@ -20,7 +20,7 @@ new_subsurface_notify(struct wl_listener *listener, void *data)
 {
 	struct view *view = wl_container_of(listener, view, new_subsurface);
 	struct wlr_subsurface *wlr_subsurface = data;
-	subsurface_create(view, wlr_subsurface);
+	view_subsurface_create(view, wlr_subsurface);
 }
 
 static bool
@@ -337,11 +337,11 @@ xdg_toplevel_view_map(struct view *view)
 		struct wlr_subsurface *subsurface;
 		wl_list_for_each(subsurface, &view->surface->current.subsurfaces_below,
 				 current.link) {
-			subsurface_create(view, subsurface);
+			view_subsurface_create(view, subsurface);
 		}
 		wl_list_for_each(subsurface, &view->surface->current.subsurfaces_above,
 				 current.link) {
-			subsurface_create(view, subsurface);
+			view_subsurface_create(view, subsurface);
 		}
 
 		view->been_mapped = true;