Merge branch 'master' into master

This commit is contained in:
Drew DeVault 2018-04-24 19:57:03 +02:00 committed by GitHub
commit 4779d8ca41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -162,9 +162,11 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
return; return;
} }
// last doesn't actually need initialization,
// but gcc (7.3.1) is too dumb to figure it out
struct swaybar_workspace *first = NULL; struct swaybar_workspace *first = NULL;
struct swaybar_workspace *active = NULL; struct swaybar_workspace *active = NULL;
struct swaybar_workspace *last; struct swaybar_workspace *last = NULL;
struct swaybar_workspace *iter; struct swaybar_workspace *iter;
wl_list_for_each(iter, &output->workspaces, link) { wl_list_for_each(iter, &output->workspaces, link) {