diff options
| author | Ken Brown <kbrown@cornell.edu> | 2022-05-24 21:26:33 +0300 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2022-05-30 00:54:32 +0300 |
| commit | e1ce752a1dec6134d6a05d54fc7ba6d9177513c5 (patch) | |
| tree | 8c505dee6d2f0b9382733bef59f5ebe7677c658a /winsup/cygwin/net.cc | |
| parent | b1e304cbd310a6bf36356ccb87aba24f03881885 (diff) | |
Cygwin: remove miscellaneous 32-bit code
Diffstat (limited to 'winsup/cygwin/net.cc')
| -rw-r--r-- | winsup/cygwin/net.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 36e2923b4..e6c5eadf2 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -12,13 +12,11 @@ details. */ #define USE_SYS_TYPES_FD_SET #define __WSA_ERR_MACROS_DEFINED #include "winsup.h" -#ifdef __x86_64__ /* 2014-04-24: Current Mingw headers define sockaddr_in6 using u_long (8 byte) because a redefinition for LP64 systems is missing. This leads to a wrong definition and size of sockaddr_in6 when building with winsock headers. */ #undef u_long #define u_long __ms_u_long -#endif #include <w32api/ws2tcpip.h> #include <w32api/mswsock.h> #include <w32api/iphlpapi.h> @@ -290,7 +288,6 @@ realloc_ent (int sz, hostent *) The 'unionent' struct is a union of all of the currently used *ent structure. */ -#ifdef __x86_64__ /* For some baffling reason, somebody at Microsoft decided that it would be a good idea to exchange the s_port and s_proto members in the servent structure. */ @@ -302,9 +299,6 @@ struct win64_servent short s_port; }; #define WIN_SERVENT(x) ((win64_servent *)(x)) -#else -#define WIN_SERVENT(x) ((servent *)(x)) -#endif #ifdef DEBUGGING static void * @@ -3078,11 +3072,9 @@ cygwin_getaddrinfo (const char *hostname, const char *servname, /* sizeof addrinfo == sizeof addrinfoW */ memcpy (&whints, hints, sizeof whints); whints.ai_flags &= ~AI_IDN_MASK; -#ifdef __x86_64__ /* ai_addrlen is socklen_t (4 bytes) in POSIX but size_t (8 bytes) in Winsock. Sert upper 4 bytes explicitely to 0 to avoid EAI_FAIL. */ whints.ai_addrlen &= UINT32_MAX; -#endif /* On Windows, the default behaviour is as if AI_ADDRCONFIG is set, apparently for performance reasons. To get the POSIX default behaviour, the AI_ALL flag has to be set. */ |