diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2012-09-28 09:02:31 +0100 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2012-09-28 09:02:31 +0100 |
| commit | 72e6b643d040f276d474b709b942bdd8d03bc2a2 (patch) | |
| tree | 096cc06b9d44a8ea65dcfc6d898fa1af23fb2aaf /win32/include | |
| parent | 1af70165a5e66fcde5decf8b027291ef927e4b2b (diff) | |
| download | perl-72e6b643d040f276d474b709b942bdd8d03bc2a2.tar.gz | |
Remove option to build without USE_SOCKETS_AS_HANDLES on Windows
The option is always defined by default and can't be disabled from the
makefiles. Manually disabling it causes several tests to fail, which
nobody has reported, so we presume nobody does this. The non-default
configuration is believed to be historical cruft with no value now, and
has clearly bitrotted in recent years (hence the test failures), so
remove it to simplify the codebase slightly.
Diffstat (limited to 'win32/include')
| -rw-r--r-- | win32/include/sys/socket.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h index 26a92c78dd..6009572725 100644 --- a/win32/include/sys/socket.h +++ b/win32/include/sys/socket.h @@ -195,8 +195,6 @@ extern "C" { #undef EAFNOSUPPORT #define EAFNOSUPPORT WSAEAFNOSUPPORT -#ifdef USE_SOCKETS_AS_HANDLES - #ifndef PERL_FD_SETSIZE #define PERL_FD_SETSIZE 64 #endif @@ -221,16 +219,6 @@ typedef struct Perl_fd_set { #define PERL_FD_ISSET(n,p) \ ((p)->bits[(n)/PERL_NFDBITS] & ((unsigned)1 << ((n)%PERL_NFDBITS))) -#else /* USE_SOCKETS_AS_HANDLES */ - -#define Perl_fd_set fd_set -#define PERL_FD_SET(n,p) FD_SET(n,p) -#define PERL_FD_CLR(n,p) FD_CLR(n,p) -#define PERL_FD_ISSET(n,p) FD_ISSET(n,p) -#define PERL_FD_ZERO(p) FD_ZERO(p) - -#endif /* USE_SOCKETS_AS_HANDLES */ - SOCKET win32_accept (SOCKET s, struct sockaddr *addr, int *addrlen); int win32_bind (SOCKET s, const struct sockaddr *addr, int namelen); int win32_closesocket (SOCKET s); @@ -331,7 +319,6 @@ void win32_endservent(void); #define setprotoent win32_setprotoent #define setservent win32_setservent -#ifdef USE_SOCKETS_AS_HANDLES #undef fd_set #undef FD_SET #undef FD_CLR @@ -342,7 +329,6 @@ void win32_endservent(void); #define FD_CLR(n,p) PERL_FD_CLR(n,p) #define FD_ISSET(n,p) PERL_FD_ISSET(n,p) #define FD_ZERO(p) PERL_FD_ZERO(p) -#endif /* USE_SOCKETS_AS_HANDLES */ #endif /* WIN32SCK_IS_STDSCK */ |