1 files changed, 14 insertions, 15 deletions

diff --git a/lib/imsg.h b/lib/imsg.h
index ddaf71344e..eed7074e4a 100644
--- a/lib/imsg.h
+++ b/lib/imsg.h
@@ -27,7 +27,7 @@
 
 struct ibuf {
 	TAILQ_ENTRY(ibuf) entry;
-	u_char *buf;
+	uint8_t *buf;
 	size_t size;
 	size_t max;
 	size_t wpos;
@@ -37,13 +37,13 @@ struct ibuf {
 
 struct msgbuf {
 	TAILQ_HEAD(, ibuf) bufs;
-	u_int32_t queued;
+	uint32_t queued;
 	int fd;
 };
 
 struct ibuf_read {
-	u_char buf[IBUF_READ_SIZE];
-	u_char *rptr;
+	uint8_t buf[IBUF_READ_SIZE];
+	uint8_t *rptr;
 	size_t wpos;
 };
 
@@ -63,11 +63,11 @@ struct imsgbuf {
 #define IMSGF_HASFD	1
 
 struct imsg_hdr {
-	u_int32_t type;
-	u_int16_t len;
-	u_int16_t flags;
-	u_int32_t peerid;
-	u_int32_t pid;
+	uint32_t type;
+	uint16_t len;
+	uint16_t flags;
+	uint32_t peerid;
+	uint32_t pid;
 };
 
 struct imsg {
@@ -97,13 +97,12 @@ void msgbuf_drain(struct msgbuf *, size_t);
 void imsg_init(struct imsgbuf *, int);
 ssize_t imsg_read(struct imsgbuf *);
 ssize_t imsg_get(struct imsgbuf *, struct imsg *);
-int imsg_compose(struct imsgbuf *, u_int32_t, u_int32_t, pid_t, int,
-		 const void *, u_int16_t);
-int imsg_composev(struct imsgbuf *, u_int32_t, u_int32_t, pid_t, int,
+int imsg_compose(struct imsgbuf *, uint32_t, uint32_t, pid_t, int, const void *,
+		 uint16_t);
+int imsg_composev(struct imsgbuf *, uint32_t, uint32_t, pid_t, int,
 		  const struct iovec *, int);
-struct ibuf *imsg_create(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
-			 u_int16_t);
-int imsg_add(struct ibuf *, const void *, u_int16_t);
+struct ibuf *imsg_create(struct imsgbuf *, uint32_t, uint32_t, pid_t, uint16_t);
+int imsg_add(struct ibuf *, const void *, uint16_t);
 void imsg_close(struct imsgbuf *, struct ibuf *);
 void imsg_free(struct imsg *);
 int imsg_flush(struct imsgbuf *);