diff options
author | emersion <contact@emersion.fr> | 2019-01-06 13:59:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-06 13:59:39 +0100 |
commit | 688f4137a573d87f591c86edafdaf7c0f4d0aee4 (patch) | |
tree | c5e156dde1594c301153a47ca633b9a0b8b2d5a8 | |
parent | Merge pull request #3367 from oscarwcl/swaylock-fix-capslock (diff) | |
parent | Use %z for printing size_t (diff) | |
download | sway-688f4137a573d87f591c86edafdaf7c0f4d0aee4.tar.gz sway-688f4137a573d87f591c86edafdaf7c0f4d0aee4.tar.zst sway-688f4137a573d87f591c86edafdaf7c0f4d0aee4.zip |
Merge pull request #3378 from jbeich/master
Unbreak build on 32bit platforms
-rw-r--r-- | sway/desktop/transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index bf0038b4..f46938e2 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c | |||
@@ -363,7 +363,7 @@ static void transaction_progress_queue(void) { | |||
363 | 363 | ||
364 | static int handle_timeout(void *data) { | 364 | static int handle_timeout(void *data) { |
365 | struct sway_transaction *transaction = data; | 365 | struct sway_transaction *transaction = data; |
366 | wlr_log(WLR_DEBUG, "Transaction %p timed out (%li waiting)", | 366 | wlr_log(WLR_DEBUG, "Transaction %p timed out (%zi waiting)", |
367 | transaction, transaction->num_waiting); | 367 | transaction, transaction->num_waiting); |
368 | transaction->num_waiting = 0; | 368 | transaction->num_waiting = 0; |
369 | transaction_progress_queue(); | 369 | transaction_progress_queue(); |
@@ -472,7 +472,7 @@ static void set_instruction_ready( | |||
472 | struct timespec *start = &transaction->commit_time; | 472 | struct timespec *start = &transaction->commit_time; |
473 | float ms = (now.tv_sec - start->tv_sec) * 1000 + | 473 | float ms = (now.tv_sec - start->tv_sec) * 1000 + |
474 | (now.tv_nsec - start->tv_nsec) / 1000000.0; | 474 | (now.tv_nsec - start->tv_nsec) / 1000000.0; |
475 | wlr_log(WLR_DEBUG, "Transaction %p: %li/%li ready in %.1fms (%s)", | 475 | wlr_log(WLR_DEBUG, "Transaction %p: %zi/%zi ready in %.1fms (%s)", |
476 | transaction, | 476 | transaction, |
477 | transaction->num_configures - transaction->num_waiting + 1, | 477 | transaction->num_configures - transaction->num_waiting + 1, |
478 | transaction->num_configures, ms, | 478 | transaction->num_configures, ms, |