[PATCH 20/22] Always provide vm_object.h and vm_size_t

[Sebastian Huber]

Always provide vm_object.h and vm_size_t via <sys/types.h> for BSD
compatibility.  These types are not defined by glibc <sys/types.h>.  An
option is to provide them only if __BSD_VISIBLE.  However, this changes
the visibility on Cygwin.

Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
---
 newlib/libc/include/sys/types.h      |  6 ++++--
 winsup/cygwin/include/cygwin/types.h | 10 ----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 3125292..51b52e5 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -192,8 +192,6 @@ typedef	__ino_t		ino_t;		/* inode number */
 
 #if defined(__i386__) && (defined(GO32) || defined(__MSDOS__))
 typedef	char *		addr_t;
-typedef unsigned long vm_offset_t;
-typedef unsigned long vm_size_t;
 #endif /* __i386__ && (GO32 || __MSDOS__) */
 
 /*
@@ -269,6 +267,10 @@ typedef	__suseconds_t	suseconds_t;
 
 typedef	__int64_t	sbintime_t;
 
+typedef	__uintptr_t	vm_offset_t;
+
+typedef	__uintptr_t	vm_size_t;
+
 #include <sys/features.h>
 
 
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
index 99fa28c..e4f7371 100644
--- a/winsup/cygwin/include/cygwin/types.h
+++ b/winsup/cygwin/include/cygwin/types.h
@@ -53,16 +53,6 @@ struct flock {
 	pid_t	 l_pid;		/* returned with F_GETLK */
 };
 
-#ifndef __vm_offset_t_defined
-#define __vm_offset_t_defined
-typedef unsigned long vm_offset_t;
-#endif /*__vm_offset_t_defined*/
-
-#ifndef __vm_size_t_defined
-#define __vm_size_t_defined
-typedef unsigned long vm_size_t;
-#endif /*__vm_size_t_defined*/
-
 #ifndef __vm_object_t_defined
 #define __vm_object_t_defined
 typedef void *vm_object_t;
-- 
1.8.4.5