From 3f961ece4626f910cf274e27f255e24543169152 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 9 Feb 2017 19:02:43 +0100
Subject: [PATCH] <aio.h>: Prepare for the removal of <sys/types.h> from
 <sys/_timespec.h>.

Right now, <sys/aio.h> gets a number of required type definitions via
<sys/_timespec.h>, which includes <sys/types.h>. Instead of including
<sys/types.h> from <sys/aio.h> directly, go for a lighter namespace.
---
 sys/sys/aio.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index 961e5904e2..affae2c23e 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -19,8 +19,25 @@
 #ifndef _SYS_AIO_H_
 #define	_SYS_AIO_H_
 
+#include <sys/_pthreadtypes.h>
 #include <sys/_timespec.h>
 #include <sys/signal.h>
+#include <sys/stdint.h>
+
+#ifndef _OFF_T_DECLARED
+typedef	__off_t		off_t;
+#define	_OFF_T_DECLARED
+#endif
+
+#ifndef _SIZE_T_DECLARED
+#define	_SIZE_T_DECLARED
+typedef	__size_t	size_t;
+#endif
+
+#ifndef _SSIZE_T_DECLARED
+#define	_SSIZE_T_DECLARED
+typedef	__ssize_t	ssize_t;
+#endif
 
 /*
  * Returned by aio_cancel:
-- 
2.11.4.GIT