aboutsummaryrefslogtreecommitdiff
path: root/compat/imsg.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2020-11-03 08:35:52 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2020-11-03 08:35:52 +0000
commitba9962b568dd111455963c88b0458cf8847c9690 (patch)
treea13a66498befbd75237a3a7a3869ccd2c52b8452 /compat/imsg.h
parent733abfcfc5b05cb3e1f2cf08f00a9325c6f6fa04 (diff)
parentff53eed402abb146096673963da39b5036a5c861 (diff)
downloadrtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.gz
rtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.bz2
rtmux-ba9962b568dd111455963c88b0458cf8847c9690.zip
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'compat/imsg.h')
-rw-r--r--compat/imsg.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/compat/imsg.h b/compat/imsg.h
index 8bf94147..5b092cfc 100644
--- a/compat/imsg.h
+++ b/compat/imsg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: imsg.h,v 1.4 2017/03/24 09:34:12 nicm Exp $ */
+/* $OpenBSD: imsg.h,v 1.5 2019/01/20 02:50:03 bcook Exp $ */
/*
* Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -21,13 +21,15 @@
#ifndef _IMSG_H_
#define _IMSG_H_
+#include <stdint.h>
+
#define IBUF_READ_SIZE 65535
#define IMSG_HEADER_SIZE sizeof(struct imsg_hdr)
#define MAX_IMSGSIZE 16384
struct ibuf {
TAILQ_ENTRY(ibuf) entry;
- u_char *buf;
+ unsigned char *buf;
size_t size;
size_t max;
size_t wpos;
@@ -42,8 +44,8 @@ struct msgbuf {
};
struct ibuf_read {
- u_char buf[IBUF_READ_SIZE];
- u_char *rptr;
+ unsigned char buf[IBUF_READ_SIZE];
+ unsigned char *rptr;
size_t wpos;
};