===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/utf8.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- src/usr.bin/tmux/utf8.c	2020/05/25 09:32:10	1.45
+++ src/usr.bin/tmux/utf8.c	2020/05/25 15:02:25	1.46
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.45 2020/05/25 09:32:10 nicm Exp $ */
+/* $OpenBSD: utf8.c,v 1.46 2020/05/25 15:02:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -55,7 +55,7 @@
 static u_int utf8_big_list_used;
 
 union utf8_big_map {
-	uint32_t	value;
+	u_int	value;
 	struct {
 		u_char	flags;
 #define UTF8_BIG_SIZE 0x1f
@@ -125,7 +125,7 @@
 }
 
 /* Get UTF-8 as index into buffer. */
-uint32_t
+u_int
 utf8_map_big(const struct utf8_data *ud)
 {
 	union utf8_big_map	 m = { .value = 0 };
@@ -165,7 +165,7 @@
 
 /* Get UTF-8 from index into buffer. */
 void
-utf8_get_big(uint32_t v, struct utf8_data *ud)
+utf8_get_big(u_int v, struct utf8_data *ud)
 {
 	union utf8_big_map	 m = { .value = v };
 	struct utf8_big_item	*bi;
@@ -183,7 +183,7 @@
 		return;
 	}
 
-	o = ((uint32_t)m.data[2] << 16)|((uint32_t)m.data[1] << 8)|m.data[0];
+	o = ((u_int)m.data[2] << 16)|((u_int)m.data[1] << 8)|m.data[0];
 	if (o >= utf8_big_list_used)
 		memset(ud->data, ' ', ud->size);
 	else {
@@ -193,7 +193,7 @@
 }
 
 /* Get big value for UTF-8 single character. */
-uint32_t
+u_int
 utf8_set_big(char c, u_int width)
 {
 	union utf8_big_map	m = { .flags = 1, .data[0] = c };