summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>2001-08-05 21:35:50 +0000
committerGurusamy Sarathy <gsar@cpan.org>2001-08-05 21:35:50 +0000
commit8d3f517adfffb573694d590afed9fde23dd83cec (patch)
treed39168062ac18a2458059eb7eaa60ad33976c89f
parentfccabc05f273b51e37e2b07d0cf1b9ed17d0ea51 (diff)
downloadperl-8d3f517adfffb573694d590afed9fde23dd83cec.tar.gz
4-arg select() was busted on windows because change#8178 didn't
make it into mainline p4raw-link: @8178 on //depot/maint-5.6/perl: 961154a63c3a7b345be8bfbe688f4d089c92e684 p4raw-id: //depot/perl@11589
-rw-r--r--perl.h2
-rw-r--r--win32/include/sys/socket.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl.h b/perl.h
index 3c7304fe1d..b85b88fb71 100644
--- a/perl.h
+++ b/perl.h
@@ -752,7 +752,7 @@ typedef struct perl_mstats perl_mstats_t;
# define _SOCKADDR_LEN
#endif
-#if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */
+#if defined(HAS_SOCKET) && !defined(VMS) && !defined(WIN32) /* VMS/WIN32 handle sockets via vmsish.h/win32.h */
# include <sys/socket.h>
# if defined(USE_SOCKS) && defined(I_SOCKS)
# if !defined(INCLUDE_PROTOTYPES)
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h
index e83fd2bd94..d1f1de6b6a 100644
--- a/win32/include/sys/socket.h
+++ b/win32/include/sys/socket.h
@@ -17,6 +17,8 @@ extern "C" {
#include <windows.h>
#include <winsock.h>
+#include "win32.h"
+
#define ENOTSOCK WSAENOTSOCK
#ifdef USE_SOCKETS_AS_HANDLES