summaryrefslogtreecommitdiff
path: root/win32/include
diff options
context:
space:
mode:
authorJan Dubois <jand@activestate.com>2005-11-21 13:35:51 -0800
committerH.Merijn Brand <h.m.brand@xs4all.nl>2005-11-22 06:33:05 +0000
commita86d78b98bbb3a5fa56caee3b81e72336148be12 (patch)
tree0328e086670cc947391f52aa04ddeab8031afe54 /win32/include
parentaf68e75656cbfd664098f1282fc660db7e34b9ca (diff)
downloadperl-a86d78b98bbb3a5fa56caee3b81e72336148be12.tar.gz
RE: [perl #37708] [PATCH] wrong IP_ constants on Win32
From: "Jan Dubois" <jand@ActiveState.com> Message-ID: <062401c5ef26$99b3a490$2217a8c0@candy> p4raw-id: //depot/perl@26189
Diffstat (limited to 'win32/include')
-rw-r--r--win32/include/sys/socket.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h
index 0f71ad855a..d2ef6e7752 100644
--- a/win32/include/sys/socket.h
+++ b/win32/include/sys/socket.h
@@ -15,7 +15,11 @@ extern "C" {
# define Win32_Winsock
#endif
#include <windows.h>
-#include <winsock.h>
+
+/* Too late to include winsock2.h if winsock.h has already been loaded */
+#ifndef _WINSOCKAPI_
+# include <winsock2.h>
+#endif
#include "win32.h"