From 2e5664d2df02a902300f8f67b4eefe0309bde5b9 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Fri, 24 Mar 2017 10:05:53 +0000
Subject: Update imsg*.[ch] from OpenBSD, add some compat bits it needs and
 remove some bits it doesn't.

---
 compat.h | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'compat.h')

diff --git a/compat.h b/compat.h
index 39e784dc..e85536cb 100644
--- a/compat.h
+++ b/compat.h
@@ -51,13 +51,6 @@
 #include <sys/filio.h>
 #endif
 
-#ifndef HAVE_BSD_TYPES
-typedef uint8_t u_int8_t;
-typedef uint16_t u_int16_t;
-typedef uint32_t u_int32_t;
-typedef uint64_t u_int64_t;
-#endif
-
 #ifdef HAVE_ERR_H
 #include <err.h>
 #else
@@ -217,6 +210,16 @@ void	warnx(const char *, ...);
 #define flock(fd, op) (0)
 #endif
 
+#ifndef HAVE_EXPLICIT_BZERO
+/* explicit_bzero.c */
+void		 explicit_bzero(void *, size_t);
+#endif
+
+#ifndef HAVE_GETDTABLECOUNT
+/* getdtablecount.c */
+int		 getdtablecount(void);
+#endif
+
 #ifndef HAVE_CLOSEFROM
 /* closefrom.c */
 void		 closefrom(int);
@@ -317,6 +320,11 @@ void		 cfmakeraw(struct termios *);
 void		*reallocarray(void *, size_t, size_t);
 #endif
 
+#ifndef HAVE_RECALLOCARRAY
+/* recallocarray.c */
+void		*recallocarray(void *, size_t, size_t, size_t);
+#endif
+
 #ifdef HAVE_UTF8PROC
 /* utf8proc.c */
 int		 utf8proc_wcwidth(wchar_t);
-- 
cgit v1.2.3