diff options
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygserver/bsd_helper.h | 1 | ||||
| -rw-r--r-- | winsup/cygwin/gcrt0.c | 1 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/in.h | 16 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/socket.h | 8 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/dirent.h | 4 | ||||
| -rw-r--r-- | winsup/cygwin/winsup.h | 1 |
6 files changed, 14 insertions, 17 deletions
diff --git a/winsup/cygserver/bsd_helper.h b/winsup/cygserver/bsd_helper.h index 778d4ee73..b2d866277 100644 --- a/winsup/cygserver/bsd_helper.h +++ b/winsup/cygserver/bsd_helper.h @@ -10,7 +10,6 @@ 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 d66bdd72c..f02b3be59 100644 --- a/winsup/cygwin/gcrt0.c +++ b/winsup/cygwin/gcrt0.c @@ -13,7 +13,6 @@ 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 83a01d3a3..42b776653 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 4d7a521a2..0ca8300d9 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; - __int8_t _ss_pad1[_SS_PAD1SIZE]; - __int64_t __ss_align; - __int8_t _ss_pad2[_SS_PAD2SIZE]; + char _ss_pad1[_SS_PAD1SIZE]; + int64_t __ss_align; + char _ss_pad2[_SS_PAD2SIZE]; }; #endif diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h index 393c27e41..0e7a78cc0 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 3cfae786c..1f265ec28 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -36,7 +36,6 @@ 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 |