diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-11-03 08:35:52 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-11-03 08:35:52 +0000 |
| commit | ba9962b568dd111455963c88b0458cf8847c9690 (patch) | |
| tree | a13a66498befbd75237a3a7a3869ccd2c52b8452 /control.c | |
| parent | 733abfcfc5b05cb3e1f2cf08f00a9325c6f6fa04 (diff) | |
| parent | ff53eed402abb146096673963da39b5036a5c861 (diff) | |
| download | rtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.gz rtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.bz2 rtmux-ba9962b568dd111455963c88b0458cf8847c9690.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'control.c')
| -rw-r--r-- | control.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -688,8 +688,8 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit) else age = 0; log_debug("%s: %s: output block %zu (age %llu) for %%%u " - "(used %zu/%zu)", __func__, c->name, cb->size, age, - cp->pane, used, limit); + "(used %zu/%zu)", __func__, c->name, cb->size, + (unsigned long long)age, cp->pane, used, limit); size = cb->size; if (size > limit - used) |