commit a7b6155

Michael Forney  ·  2022-05-11 21:21:42 +0000 UTC
parent 92f2a46 
Rename close to avoid conflict with unistd.h function
3 files changed,  +6, -6
M libswc/shell_surface.c
M libswc/xdg_shell.c
M libswc/xwm.c
M libswc/shell_surface.c
+2, -2 
 1@@ -55,7 +55,7 @@ configure(struct window *window, uint32_t width, uint32_t height)
 2 }
 3 
 4 static void
 5-close(struct window *window)
 6+close_(struct window *window)
 7 {
 8 	struct shell_surface *shell_surface = wl_container_of(window, shell_surface, window);
 9 	struct wl_client *client;
10@@ -68,7 +68,7 @@ close(struct window *window)
11 
12 static const struct window_impl window_impl = {
13 	.configure = configure,
14-	.close = close,
15+	.close = close_,
16 };
17 
18 static void
M libswc/xdg_shell.c
+2, -2 
 1@@ -301,7 +301,7 @@ unfocus(struct window *window)
 2 }
 3 
 4 static void
 5-close(struct window *window)
 6+close_(struct window *window)
 7 {
 8 	struct xdg_toplevel *toplevel = wl_container_of(window, toplevel, window);
 9 
10@@ -338,7 +338,7 @@ static const struct window_impl toplevel_window_impl = {
11 	.configure = configure,
12 	.focus = focus,
13 	.unfocus = unfocus,
14-	.close = close,
15+	.close = close_,
16 	.set_mode = set_mode,
17 };
18
M libswc/xwm.c
+2, -2 
 1@@ -196,7 +196,7 @@ unfocus(struct window *window)
 2 }
 3 
 4 static void
 5-close(struct window *window)
 6+close_(struct window *window)
 7 {
 8 	struct xwl_window *xwl_window = wl_container_of(window, xwl_window, window);
 9 
10@@ -225,7 +225,7 @@ static const struct window_impl xwl_window_handler = {
11 	.configure = configure,
12 	.focus = focus,
13 	.unfocus = unfocus,
14-	.close = close,
15+	.close = close_,
16 };
17 
18 static void