sys/types.h: Don't include sys/_stdint.h

By including sys/_stdint.h, all types from stdint.h are
exposed even if stdint.h isn't pulled in explicitely. Include
<machine/_default_types.h instead. Fix up newlib and Cygwin
files which rely on stdint.h types, too.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

6 files changed, 17 insertions, 14 deletions

diff --git a/winsup/cygserver/bsd_helper.h b/winsup/cygserver/bsd_helper.h
index b2d8662..778d4ee 100644
--- a/winsup/cygserver/bsd_helper.h
+++ b/winsup/cygserver/bsd_helper.h
@@ -10,6 +10,7 @@ details. */
 
 #include <sys/types.h>
 #include <sys/syslog.h>
+#include <stdint.h>
 
 enum tun_bool_t {
   TUN_UNDEF = 0,
diff --git a/winsup/cygwin/gcrt0.c b/winsup/cygwin/gcrt0.c
index f02b3be..d66bdd7 100644
--- a/winsup/cygwin/gcrt0.c
+++ b/winsup/cygwin/gcrt0.c
@@ -13,6 +13,7 @@ details. */
 
 #include <sys/types.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 #ifdef __MINGW32__
 #include <_bsd_types.h>
diff --git a/winsup/cygwin/include/cygwin/in.h b/winsup/cygwin/include/cygwin/in.h
index 42b7766..83a01d3 100644
--- a/winsup/cygwin/include/cygwin/in.h
+++ b/winsup/cygwin/include/cygwin/in.h
@@ -148,8 +148,8 @@ struct ip_msfilter
 {
   struct in_addr imsf_multiaddr;
   struct in_addr imsf_interface;
-  uint32_t       imsf_fmode;
-  uint32_t       imsf_numsrc;
+  __uint32_t       imsf_fmode;
+  __uint32_t       imsf_numsrc;
   struct in_addr imsf_slist[1];
 };
 
@@ -160,30 +160,30 @@ struct ip_msfilter
 struct in_pktinfo
 {
   struct in_addr ipi_addr;
-  uint32_t       ipi_ifindex;
+  __uint32_t       ipi_ifindex;
 };
 
 /* Request struct for IP agnostic multicast socket ops */
 
 struct group_req
 {
-  uint32_t                gr_interface;
+  __uint32_t                gr_interface;
   struct sockaddr_storage gr_group;
 };
 
 struct group_source_req
 {
-  uint32_t                gsr_interface;
+  __uint32_t                gsr_interface;
   struct sockaddr_storage gsr_group;
   struct sockaddr_storage gsr_source;
 };
 
 struct group_filter
 {
-  uint32_t                gf_interface;
+  __uint32_t                gf_interface;
   struct sockaddr_storage gf_group;
-  uint32_t                gf_fmode;
-  uint32_t                gf_numsrc;
+  __uint32_t                gf_fmode;
+  __uint32_t                gf_numsrc;
   struct sockaddr_storage gf_slist[1];
 };
 
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index 0ca8300..4d7a521 100644
--- a/winsup/cygwin/include/cygwin/socket.h
+++ b/winsup/cygwin/include/cygwin/socket.h
@@ -31,16 +31,16 @@ struct sockaddr {
 
 /* Definition of sockaddr_storage according to SUSv3. */
 #define _SS_MAXSIZE 128			/* Maximum size. */
-#define _SS_ALIGNSIZE (sizeof (int64_t))/* Desired alignment. */
+#define _SS_ALIGNSIZE (sizeof (__int64_t))/* Desired alignment. */
 #define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (sa_family_t))
 #define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (sa_family_t) \
 		      + _SS_PAD1SIZE + _SS_ALIGNSIZE))
 
 struct sockaddr_storage {
   sa_family_t		ss_family;
-  char			_ss_pad1[_SS_PAD1SIZE];
-  int64_t		__ss_align;
-  char			_ss_pad2[_SS_PAD2SIZE];
+  __int8_t		_ss_pad1[_SS_PAD1SIZE];
+  __int64_t		__ss_align;
+  __int8_t		_ss_pad2[_SS_PAD2SIZE];
 };
 #endif
 
diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h
index 0e7a78c..393c27e 100644
--- a/winsup/cygwin/include/sys/dirent.h
+++ b/winsup/cygwin/include/sys/dirent.h
@@ -21,7 +21,7 @@
 #define _DIRENT_HAVE_D_TYPE
 struct dirent
 {
-  uint32_t __d_version;			/* Used internally */
+  __uint32_t __d_version;			/* Used internally */
   ino_t d_ino;
   unsigned char d_type;
   unsigned char __d_unused1[3];
@@ -51,7 +51,7 @@ typedef struct __DIR
   char *__d_dirname;			/* directory name with trailing '*' */
   __int32_t __d_position;			/* used by telldir/seekdir */
   int __d_fd;
-  uintptr_t __d_internal;
+  __uintptr_t __d_internal;
   void *__handle;
   void *__fh;
   unsigned __flags;
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 1f265ec..3cfae78 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -36,6 +36,7 @@ details. */
 #include <sys/types.h>
 #include <sys/strace.h>
 #include <sys/smallprint.h>
+#include <stdint.h>
 
 /* Declarations for functions used in C and C++ code. */
 #ifdef __cplusplus