alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3378 from jbeich/master

Browse source 
Unbreak build on 32bit platforms
This commit is contained in:
emersion 2019-01-06 13:59:39 +01:00 committed by GitHub
parent 728e5700dd 4a11d0e470
commit 688f4137a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/desktop/transaction.c
View file

@ -363,7 +363,7 @@ static void transaction_progress_queue(void) {
static int handle_timeout(void *data) { static int handle_timeout(void *data) {
struct sway_transaction *transaction = data; struct sway_transaction *transaction = data;
wlr_log(WLR_DEBUG, "Transaction %p timed out (%li waiting)", wlr_log(WLR_DEBUG, "Transaction %p timed out (%zi waiting)",
transaction, transaction->num_waiting); transaction, transaction->num_waiting);
transaction->num_waiting = 0; transaction->num_waiting = 0;
transaction_progress_queue(); transaction_progress_queue();
@ -472,7 +472,7 @@ static void set_instruction_ready(
struct timespec *start = &transaction->commit_time; struct timespec *start = &transaction->commit_time;
float ms = (now.tv_sec - start->tv_sec) * 1000 + float ms = (now.tv_sec - start->tv_sec) * 1000 +
(now.tv_nsec - start->tv_nsec) / 1000000.0; (now.tv_nsec - start->tv_nsec) / 1000000.0;
wlr_log(WLR_DEBUG, "Transaction %p: %li/%li ready in %.1fms (%s)", wlr_log(WLR_DEBUG, "Transaction %p: %zi/%zi ready in %.1fms (%s)",
transaction, transaction,
transaction->num_configures - transaction->num_waiting + 1, transaction->num_configures - transaction->num_waiting + 1,
transaction->num_configures, ms, transaction->num_configures, ms,