diff options
| author |  Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-09-21 20:05:39 +1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-21 20:05:39 +1000 |
| commit | 0798fadff2f2f74a7efd7c14c55737bac19de954 (patch) | |
| tree | 86e1ab4983fec3586a8bbb0044216216e22cc1cb /swaybar/event_loop.c | |
| parent | Fix segfault in output_render (diff) | |
| parent | Merge pull request #2671 from emersion/output-execute-no-focus (diff) | |
| download | sway-0798fadff2f2f74a7efd7c14c55737bac19de954.tar.gz sway-0798fadff2f2f74a7efd7c14c55737bac19de954.tar.zst sway-0798fadff2f2f74a7efd7c14c55737bac19de954.zip | |
Merge branch 'master' into render-output-segfault
Diffstat (limited to 'swaybar/event_loop.c')
| -rw-r--r-- | swaybar/event_loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaybar/event_loop.c b/swaybar/event_loop.c index bc4053be..686b9962 100644 --- a/swaybar/event_loop.c +++ b/swaybar/event_loop.c | |||
| @@ -105,7 +105,7 @@ bool remove_timer(timer_t timer) { | |||
| 105 | return false; | 105 | return false; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | void event_loop_poll() { | 108 | void event_loop_poll(void) { |
| 109 | poll(event_loop.fds.items, event_loop.fds.length, -1); | 109 | poll(event_loop.fds.items, event_loop.fds.length, -1); |
| 110 | 110 | ||
| 111 | for (int i = 0; i < event_loop.fds.length; ++i) { | 111 | for (int i = 0; i < event_loop.fds.length; ++i) { |
| @@ -146,7 +146,7 @@ void event_loop_poll() { | |||
| 146 | } | 146 | } |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | void init_event_loop() { | 149 | void init_event_loop(void) { |
| 150 | event_loop.fds.length = 0; | 150 | event_loop.fds.length = 0; |
| 151 | event_loop.fds.capacity = 10; | 151 | event_loop.fds.capacity = 10; |
| 152 | event_loop.fds.items = malloc( | 152 | event_loop.fds.items = malloc( |