diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-11-18 08:22:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-18 08:22:25 -0500 |
commit | b87250425fe13149e41b346f15c5cf808f376438 (patch) | |
tree | 145fcb048cc3df3d04a8b6afb90de68dd2dd80a9 /sway/desktop | |
parent | eda3bfeed5097c71634332bfe998188b028abf02 (diff) | |
parent | cad851805bea6b4777685df1c6adf8cb9fa71835 (diff) |
Merge pull request #3147 from emersion/set10
Use #if instead of #ifdef
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/output.c | 6 | ||||
-rw-r--r-- | sway/desktop/render.c | 6 | ||||
-rw-r--r-- | sway/desktop/transaction.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index e8112bd9..d649100f 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -204,7 +204,7 @@ void output_layer_for_each_surface(struct sway_output *output, } } -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND void output_unmanaged_for_each_surface(struct sway_output *output, struct wl_list *unmanaged, sway_surface_iterator_func_t iterator, void *user_data) { @@ -274,7 +274,7 @@ static void output_for_each_surface(struct sway_output *output, for_each_surface_container_iterator(floater, &data); } } -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged, iterator, user_data); #endif @@ -289,7 +289,7 @@ static void output_for_each_surface(struct sway_output *output, workspace_for_each_container(workspace, for_each_surface_container_iterator, &data); -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged, iterator, user_data); #endif diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 93e196bb..8d4a701b 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -140,7 +140,7 @@ static void render_layer(struct sway_output *output, render_surface_iterator, &data); } -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND static void render_unmanaged(struct sway_output *output, pixman_region32_t *damage, struct wl_list *unmanaged) { struct render_data data = { @@ -966,7 +966,7 @@ void output_render(struct sway_output *output, struct timespec *when, render_floating_container(output, damage, floater); } } -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND render_unmanaged(output, damage, &root->xwayland_unmanaged); #endif } else { @@ -986,7 +986,7 @@ void output_render(struct sway_output *output, struct timespec *when, render_workspace(output, damage, workspace, workspace->current.focused); render_floating(output, damage); -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND render_unmanaged(output, damage, &root->xwayland_unmanaged); #endif render_layer(output, damage, diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index 39cb641f..bf0038b4 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -380,7 +380,7 @@ static bool should_configure(struct sway_node *node, } struct sway_container_state *cstate = &node->sway_container->current; struct sway_container_state *istate = &instruction->container_state; -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND // Xwayland views are position-aware and need to be reconfigured // when their position changes. if (node->sway_container->view->type == SWAY_VIEW_XWAYLAND) { |