diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-04-08 18:49:25 +0000 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-04-08 14:03:15 -0600 |
| commit | b6d0de177adaeeb0f5990613b52d50520bc15301 (patch) | |
| tree | 4b76469ff83fbba9a24cac0a1aed80aea3ee0f45 | |
| parent | 670c787fa7c8e71ed4966ae12fa70c91751eea21 (diff) | |
backend: unbreak on 32-bit architectures
backend/headless/output.c:132:3: error: format specifies type 'long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat]
++backend->last_output_num);
^~~~~~~~~~~~~~~~~~~~~~~~~~
backend/noop/output.c:72:3: error: format specifies type 'long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat]
++backend->last_output_num);
^~~~~~~~~~~~~~~~~~~~~~~~~~
backend/wayland/output.c:294:3: error: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat]
++backend->last_output_num);
^~~~~~~~~~~~~~~~~~~~~~~~~~
backend/x11/output.c:150:3: error: format specifies type 'long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat]
++x11->last_output_num);
^~~~~~~~~~~~~~~~~~~~~~
| -rw-r--r-- | backend/headless/output.c | 2 | ||||
| -rw-r--r-- | backend/noop/output.c | 2 | ||||
| -rw-r--r-- | backend/wayland/output.c | 2 | ||||
| -rw-r--r-- | backend/x11/output.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/backend/headless/output.c b/backend/headless/output.c index d200aa58..b3b41d46 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -128,7 +128,7 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, output_set_custom_mode(wlr_output, width, height, 0); strncpy(wlr_output->make, "headless", sizeof(wlr_output->make)); strncpy(wlr_output->model, "headless", sizeof(wlr_output->model)); - snprintf(wlr_output->name, sizeof(wlr_output->name), "HEADLESS-%ld", + snprintf(wlr_output->name, sizeof(wlr_output->name), "HEADLESS-%zd", ++backend->last_output_num); if (!wlr_egl_make_current(&output->backend->egl, output->egl_surface, diff --git a/backend/noop/output.c b/backend/noop/output.c index a4070383..5d9aa90d 100644 --- a/backend/noop/output.c +++ b/backend/noop/output.c @@ -68,7 +68,7 @@ struct wlr_output *wlr_noop_add_output(struct wlr_backend *wlr_backend) { strncpy(wlr_output->make, "noop", sizeof(wlr_output->make)); strncpy(wlr_output->model, "noop", sizeof(wlr_output->model)); - snprintf(wlr_output->name, sizeof(wlr_output->name), "NOOP-%ld", + snprintf(wlr_output->name, sizeof(wlr_output->name), "NOOP-%zd", ++backend->last_output_num); wl_list_insert(&backend->outputs, &output->link); diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 0f314031..64ead4ac 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -290,7 +290,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *wlr_backend) { wlr_output_update_custom_mode(wlr_output, 1280, 720, 0); strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make)); strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model)); - snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%lu", + snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%zd", ++backend->last_output_num); output->backend = backend; diff --git a/backend/x11/output.c b/backend/x11/output.c index ce90ea5e..a9bd5c0a 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -146,7 +146,7 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) { output_set_refresh(&output->wlr_output, 0); - snprintf(wlr_output->name, sizeof(wlr_output->name), "X11-%ld", + snprintf(wlr_output->name, sizeof(wlr_output->name), "X11-%zd", ++x11->last_output_num); parse_xcb_setup(wlr_output, x11->xcb); |