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 /compat/imsg-buffer.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 'compat/imsg-buffer.c')
| -rw-r--r-- | compat/imsg-buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c index 814591f4..67d4c705 100644 --- a/compat/imsg-buffer.c +++ b/compat/imsg-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg-buffer.c,v 1.11 2017/12/14 09:27:44 kettenis Exp $ */ +/* $OpenBSD: imsg-buffer.c,v 1.12 2019/01/20 02:50:03 bcook Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -70,7 +70,7 @@ ibuf_dynamic(size_t len, size_t max) static int ibuf_realloc(struct ibuf *buf, size_t len) { - u_char *b; + unsigned char *b; /* on static buffers max is eq size and so the following fails */ if (buf->wpos + len > buf->max) { |