diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-01-27 14:14:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-27 14:14:12 -0500 |
| commit | facc5ef93a705b4c4cbe4acb6ebd44b256db5d3e (patch) | |
| tree | 518b92ae08a2609451005e35f4606804dcfd6fa0 | |
| parent | 174d1aa81bac9d8795e7047686d51c5b7e75d578 (diff) | |
| parent | d7dfbd23faf0b72a58da58f060a98e9b0023256b (diff) | |
Merge pull request #588 from agx/arm
Fix warnings on arm-linux
| -rw-r--r-- | backend/drm/drm.c | 2 | ||||
| -rw-r--r-- | types/wlr_keyboard.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 47bd4e3a..63a6e2da 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -459,7 +459,7 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output, if (!crtc) { return false; } - wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name, + wlr_log(L_DEBUG, "%s: crtc=%td ovr=%td pri=%td cur=%td", conn->output.name, crtc - drm->crtcs, crtc->overlay ? crtc->overlay - drm->overlay_planes : -1, crtc->primary ? crtc->primary - drm->primary_planes : -1, diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c index b0dc97aa..29552eb4 100644 --- a/types/wlr_keyboard.c +++ b/types/wlr_keyboard.c @@ -215,13 +215,13 @@ void wlr_keyboard_set_keymap(struct wlr_keyboard *kb, } kb->keymap_fd = os_create_anonymous_file(kb->keymap_size); if (kb->keymap_fd < 0) { - wlr_log(L_ERROR, "creating a keymap file for %lu bytes failed", kb->keymap_size); + wlr_log(L_ERROR, "creating a keymap file for %zu bytes failed", kb->keymap_size); goto err; } void *ptr = mmap(NULL, kb->keymap_size, PROT_READ | PROT_WRITE, MAP_SHARED, kb->keymap_fd, 0); if (ptr == (void*)-1) { - wlr_log(L_ERROR, "failed to mmap() %lu bytes", kb->keymap_size); + wlr_log(L_ERROR, "failed to mmap() %zu bytes", kb->keymap_size); goto err; } strcpy(ptr, keymap_str); |