diff options
-rw-r--r-- | include/sway/output.h | 2 | ||||
-rw-r--r-- | include/sway/server.h | 2 | ||||
-rw-r--r-- | include/sway/tree/view.h | 2 | ||||
-rw-r--r-- | meson.build | 1 | ||||
-rw-r--r-- | sway/desktop/layer_shell.c | 2 | ||||
-rw-r--r-- | sway/desktop/output.c | 2 | ||||
-rw-r--r-- | sway/desktop/render.c | 2 | ||||
-rw-r--r-- | sway/desktop/xdg_shell.c | 2 | ||||
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 2 | ||||
-rw-r--r-- | sway/desktop/xwayland.c | 2 | ||||
-rw-r--r-- | sway/ipc-server.c | 2 | ||||
-rw-r--r-- | sway/server.c | 2 | ||||
-rw-r--r-- | sway/tree/container.c | 2 | ||||
-rw-r--r-- | sway/tree/view.c | 2 |
14 files changed, 13 insertions, 14 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index a5a2f29e..b94824b4 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define _SWAY_OUTPUT_H | 2 | #define _SWAY_OUTPUT_H |
3 | #include <time.h> | 3 | #include <time.h> |
4 | #include <unistd.h> | 4 | #include <unistd.h> |
5 | #include <wayland-server.h> | 5 | #include <wayland-server-core.h> |
6 | #include <wlr/types/wlr_box.h> | 6 | #include <wlr/types/wlr_box.h> |
7 | #include <wlr/types/wlr_output.h> | 7 | #include <wlr/types/wlr_output.h> |
8 | #include "config.h" | 8 | #include "config.h" |
diff --git a/include/sway/server.h b/include/sway/server.h index 21661685..7cbca4f2 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _SWAY_SERVER_H | 1 | #ifndef _SWAY_SERVER_H |
2 | #define _SWAY_SERVER_H | 2 | #define _SWAY_SERVER_H |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <wayland-server.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/backend.h> | 5 | #include <wlr/backend.h> |
6 | #include <wlr/backend/session.h> | 6 | #include <wlr/backend/session.h> |
7 | #include <wlr/render/wlr_renderer.h> | 7 | #include <wlr/render/wlr_renderer.h> |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4ce487fc..d9f5b8f2 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef _SWAY_VIEW_H | 1 | #ifndef _SWAY_VIEW_H |
2 | #define _SWAY_VIEW_H | 2 | #define _SWAY_VIEW_H |
3 | #include <wayland-server.h> | 3 | #include <wayland-server-core.h> |
4 | #include <wlr/types/wlr_surface.h> | 4 | #include <wlr/types/wlr_surface.h> |
5 | #include <wlr/types/wlr_xdg_shell_v6.h> | 5 | #include <wlr/types/wlr_xdg_shell_v6.h> |
6 | #include "config.h" | 6 | #include "config.h" |
diff --git a/meson.build b/meson.build index eb5039ee..6bb472f1 100644 --- a/meson.build +++ b/meson.build | |||
@@ -13,7 +13,6 @@ project( | |||
13 | 13 | ||
14 | add_project_arguments( | 14 | add_project_arguments( |
15 | [ | 15 | [ |
16 | '-DWL_HIDE_DEPRECATED', | ||
17 | '-DWLR_USE_UNSTABLE', | 16 | '-DWLR_USE_UNSTABLE', |
18 | 17 | ||
19 | '-Wno-unused-parameter', | 18 | '-Wno-unused-parameter', |
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 1667995c..ed00b282 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <stdbool.h> | 1 | #include <stdbool.h> |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <wayland-server.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/types/wlr_box.h> | 5 | #include <wlr/types/wlr_box.h> |
6 | #include <wlr/types/wlr_layer_shell_v1.h> | 6 | #include <wlr/types/wlr_layer_shell_v1.h> |
7 | #include <wlr/types/wlr_output_damage.h> | 7 | #include <wlr/types/wlr_output_damage.h> |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 22ced14e..7dcc8e51 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -3,7 +3,7 @@ | |||
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <strings.h> | 4 | #include <strings.h> |
5 | #include <time.h> | 5 | #include <time.h> |
6 | #include <wayland-server.h> | 6 | #include <wayland-server-core.h> |
7 | #include <wlr/render/wlr_renderer.h> | 7 | #include <wlr/render/wlr_renderer.h> |
8 | #include <wlr/types/wlr_box.h> | 8 | #include <wlr/types/wlr_box.h> |
9 | #include <wlr/types/wlr_buffer.h> | 9 | #include <wlr/types/wlr_buffer.h> |
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 6bea5656..9d7b89af 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -3,7 +3,7 @@ | |||
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <strings.h> | 4 | #include <strings.h> |
5 | #include <time.h> | 5 | #include <time.h> |
6 | #include <wayland-server.h> | 6 | #include <wayland-server-core.h> |
7 | #include <wlr/render/wlr_renderer.h> | 7 | #include <wlr/render/wlr_renderer.h> |
8 | #include <wlr/types/wlr_box.h> | 8 | #include <wlr/types/wlr_box.h> |
9 | #include <wlr/types/wlr_buffer.h> | 9 | #include <wlr/types/wlr_buffer.h> |
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 9e914f14..01574577 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <float.h> | 2 | #include <float.h> |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #include <wayland-server.h> | 5 | #include <wayland-server-core.h> |
6 | #include <wlr/types/wlr_xdg_shell.h> | 6 | #include <wlr/types/wlr_xdg_shell.h> |
7 | #include <wlr/util/edges.h> | 7 | #include <wlr/util/edges.h> |
8 | #include "log.h" | 8 | #include "log.h" |
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 5ac589cf..0c6ab7dc 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <float.h> | 2 | #include <float.h> |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #include <wayland-server.h> | 5 | #include <wayland-server-core.h> |
6 | #include <wlr/types/wlr_xdg_shell_v6.h> | 6 | #include <wlr/types/wlr_xdg_shell_v6.h> |
7 | #include "log.h" | 7 | #include "log.h" |
8 | #include "sway/decoration.h" | 8 | #include "sway/decoration.h" |
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index f6ca8f81..0f708201 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #define _POSIX_C_SOURCE 199309L | 1 | #define _POSIX_C_SOURCE 199309L |
2 | #include <stdbool.h> | 2 | #include <stdbool.h> |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <wayland-server.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/types/wlr_output_layout.h> | 5 | #include <wlr/types/wlr_output_layout.h> |
6 | #include <wlr/types/wlr_output.h> | 6 | #include <wlr/types/wlr_output.h> |
7 | #include <wlr/xwayland.h> | 7 | #include <wlr/xwayland.h> |
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 773e90fd..9c4f7a64 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <sys/ioctl.h> | 14 | #include <sys/ioctl.h> |
15 | #include <sys/un.h> | 15 | #include <sys/un.h> |
16 | #include <unistd.h> | 16 | #include <unistd.h> |
17 | #include <wayland-server.h> | 17 | #include <wayland-server-core.h> |
18 | #include "sway/commands.h" | 18 | #include "sway/commands.h" |
19 | #include "sway/config.h" | 19 | #include "sway/config.h" |
20 | #include "sway/desktop/transaction.h" | 20 | #include "sway/desktop/transaction.h" |
diff --git a/sway/server.c b/sway/server.c index 4f46a065..784237d4 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <assert.h> | 2 | #include <assert.h> |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #include <wayland-server.h> | 5 | #include <wayland-server-core.h> |
6 | #include <wlr/backend.h> | 6 | #include <wlr/backend.h> |
7 | #include <wlr/backend/noop.h> | 7 | #include <wlr/backend/noop.h> |
8 | #include <wlr/backend/session.h> | 8 | #include <wlr/backend/session.h> |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 10aed599..ef44c944 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #include <string.h> | 5 | #include <string.h> |
6 | #include <strings.h> | 6 | #include <strings.h> |
7 | #include <wayland-server.h> | 7 | #include <wayland-server-core.h> |
8 | #include <wlr/types/wlr_output_layout.h> | 8 | #include <wlr/types/wlr_output_layout.h> |
9 | #include <wlr/types/wlr_xdg_shell_v6.h> | 9 | #include <wlr/types/wlr_xdg_shell_v6.h> |
10 | #include <wlr/types/wlr_xdg_shell.h> | 10 | #include <wlr/types/wlr_xdg_shell.h> |
diff --git a/sway/tree/view.c b/sway/tree/view.c index be540804..bb3ae707 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <strings.h> | 3 | #include <strings.h> |
4 | #include <wayland-server.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/render/wlr_renderer.h> | 5 | #include <wlr/render/wlr_renderer.h> |
6 | #include <wlr/types/wlr_buffer.h> | 6 | #include <wlr/types/wlr_buffer.h> |
7 | #include <wlr/types/wlr_output_layout.h> | 7 | #include <wlr/types/wlr_output_layout.h> |